diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index d0ceba92d..88e521eea 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -25,7 +25,9 @@ function update_last_updated_file() {
 
 function update_ohmyzsh() {
   ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
-  update_last_updated_file
+  if [[ "$?" = (0|80) ]]; then
+    update_last_updated_file
+  fi
 }
 
 () {
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 358242d0f..4b97540d6 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 
 if [ -z "$ZSH_VERSION" ]; then
-  exec zsh "$0"
+  exec zsh "$0" "$@"
 fi
 
 cd "$ZSH"