diff --git a/defaults/.bashrc b/defaults/.bashrc
index 54b5cae..3b2c3aa 100644
--- a/defaults/.bashrc
+++ b/defaults/.bashrc
@@ -5,14 +5,14 @@ esac
 
 computer_prompt_base_name() {
   local name=""
-  if [ -n "${COMPUTER_NAME:-}" ]; then
-    name="${COMPUTER_NAME}"
-  elif [ -n "${COMPUTER_HANDLE:-}" ]; then
-    name="${COMPUTER_HANDLE}"
-  elif [ -r /etc/microagent/machine-name ]; then
+  if [ -r /etc/microagent/machine-name ]; then
     IFS= read -r name </etc/microagent/machine-name || true
   elif [ -r /etc/hostname ]; then
     IFS= read -r name </etc/hostname || true
+  elif [ -n "${COMPUTER_NAME:-}" ]; then
+    name="${COMPUTER_NAME}"
+  elif [ -n "${COMPUTER_HANDLE:-}" ]; then
+    name="${COMPUTER_HANDLE}"
   fi
   if [ -z "$name" ]; then
     name="microagentcomputer"
diff --git a/defaults/.zshrc b/defaults/.zshrc
index 5000538..88e6ee2 100644
--- a/defaults/.zshrc
+++ b/defaults/.zshrc
@@ -14,14 +14,14 @@ bindkey '^?' backward-delete-char
 
 computer_prompt_base_name() {
   local name=""
-  if [ -n "${COMPUTER_NAME:-}" ]; then
-    name="${COMPUTER_NAME}"
-  elif [ -n "${COMPUTER_HANDLE:-}" ]; then
-    name="${COMPUTER_HANDLE}"
-  elif [ -r /etc/microagent/machine-name ]; then
+  if [ -r /etc/microagent/machine-name ]; then
     IFS= read -r name </etc/microagent/machine-name || true
   elif [ -r /etc/hostname ]; then
     IFS= read -r name </etc/hostname || true
+  elif [ -n "${COMPUTER_NAME:-}" ]; then
+    name="${COMPUTER_NAME}"
+  elif [ -n "${COMPUTER_HANDLE:-}" ]; then
+    name="${COMPUTER_HANDLE}"
   fi
   if [ -z "$name" ]; then
     name="microagentcomputer"