diff --git a/vim-update.sh b/vim-update.sh
index 45c4e52..1390474 100755
--- a/vim-update.sh
+++ b/vim-update.sh
@@ -28,6 +28,11 @@ if [ "x$1" == "x--force" ]; then
   force=1
 fi
 
+if [ "x$(grep -o VERSION_ID=35 /etc/os-release)" == "xVERSION_ID=35" ]
+then
+  BODHI_USER="--user $(id -un)"
+fi
+
 DATE=`date +"%a %b %d %Y"`
 $debug fedpkg switch-branch "${branches[@]: $branches_index: 1}"
 
@@ -119,11 +124,6 @@ if [ $CHANGES -ne 0 ]; then
 
    for branch in "${branches[@]:(1)}";
    do
-     if [ "x$branch" == "xf35" ]
-     then
-       BODHI_USER="--user $(id -un)"
-     fi
-
      # switch to branch
      $debug fedpkg switch-branch $branch