diff --git a/bin/v_change_user_package b/bin/v_change_user_package
index b814b6206..e83e6b90b 100755
--- a/bin/v_change_user_package
+++ b/bin/v_change_user_package
@@ -104,6 +104,7 @@ U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS'
 U_DATABASES='$U_DATABASES'
 U_CRON_JOBS='$U_CRON_JOBS'
 U_BACKUPS='$U_BACKUPS'
+TIME='$TIME'
 DATE='$DATE'" > $USER_DATA/user.conf
 }
 
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index 8e316dac7..db7640a69 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -37,7 +37,8 @@ document.v_edit_user.v_password.value = randomstring;
             <?php
                 foreach ($packages as $key => $value) {
                     echo "\t\t\t\t<option value=\"".$key."\"";
-                    if ((!empty($v_package)) && ( $key == $v_package)){
+                    $skey = "'".$key."'";
+                    if (( $key == $v_package ) || ( $skey == $v_package)){
                         echo 'selected' ;
                     }
                     echo ">".$key."</option>\n";