diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index 815fd65c..8e316dac 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -53,9 +53,11 @@ document.v_edit_user.v_password.value = randomstring;
             <?php
                 foreach ($shells as $key => $value) {
                     echo "\t\t\t\t<option value=\"".$value."\"";
-                    if ((!empty($v_shell)) && ( $value == $v_shell)){
+                    $svalue = "'".$value."'";
+                    if (( $value == $v_shell ) || ($svalue == $v_shell )){
                         echo 'selected' ;
                     }
+
                     echo ">".$value."</option>\n";
                 }
             ?>