Fixes #1517 (#1520)

Also 1 minor issue in list_key where admin user name was always supplied when editing as admin

web/templates/admin/add_user.html

@@ -148,7 +148,7 @@
                                 <td class="vst-text input-label">
                                     <?php print _('Language');?>
                                 </td>
-                            </tr>
+                            </tr>                        
                             <tr>
                                 <td>
                                     <select class="vst-list" name="v_language" tabindex="7" >
@@ -159,7 +159,7 @@
                                                     echo ' selected' ;
                                                 }
                                                 if (isset($v_language)){
-                                                    if ( $key == $v_language ){
+                                                    if ( htmlentities($key) == trim($v_language,"'") ){
                                                         echo ' selected' ;
                                                     }
                                                 }

web/templates/admin/list_key.html

@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" id="btn-back" href="/edit/user/?user=<?php echo $_SESSION['user']?>"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
+          <a class="ui-button cancel" id="btn-back" href="/edit/user/?user=<?php echo $user;?>"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
           <?php
             echo '<a href="/add/key/" id="btn-create" class="ui-button cancel"><i class="fas fa-plus-circle status-icon green"></i>'._('Add SSH Key').'</a>';
           ?>