diff --git a/interface/web/admin/templates/remote_user_edit.htm b/interface/web/admin/templates/remote_user_edit.htm
index d518ebff6e9b197c3b1378093b465d63dcad34c9..b460aef881965d189c25b1aa4e06afffa509ff14 100644
--- a/interface/web/admin/templates/remote_user_edit.htm
+++ b/interface/web/admin/templates/remote_user_edit.htm
@@ -7,8 +7,8 @@
         
             <div class="form-group">
                 <label for="remote_username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
-                <div class="col-sm-3">{tmpl_var name='username_prefix'}</div>
-                <div class="col-sm-6"><input type="text" name="remote_username" id="username" value="{tmpl_var name='remote_username'}" class="form-control" /></div></div>
+                <div class="col-sm-2">{tmpl_var name='username_prefix'}</div>
+                <div class="col-sm-7"><input type="text" name="remote_username" id="username" value="{tmpl_var name='remote_username'}" class="form-control" /></div></div>
                 
             <div class="form-group">
                 <label for="remote_password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
diff --git a/interface/web/sites/templates/database_user_edit.htm b/interface/web/sites/templates/database_user_edit.htm
index 12d4aae830dd919d0767ebe439713b244c56ac09..50a28720bd5107cbf53be59257432305fca122ed 100644
--- a/interface/web/sites/templates/database_user_edit.htm
+++ b/interface/web/sites/templates/database_user_edit.htm
@@ -23,8 +23,8 @@
             </tmpl_if>
             <div class="form-group">
                 <label for="database_user" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
-                <div class="col-sm-3">{tmpl_var name='database_user_prefix'}</div>
-                <div class="col-sm-6"><input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" /></div></div>
+                <div class="col-sm-2">{tmpl_var name='database_user_prefix'}</div>
+                <div class="col-sm-7"><input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="database_password" class="col-sm-3 control-label">{tmpl_var name='database_password_txt'}</label>
                 <div class="col-sm-6"><input type="password" name="database_password" id="database_password" value="{tmpl_var name='database_password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('database_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
index ea87502169749ce014bdffa341c4368d8ee50109..3b02dfdc82e2e6da9571ec2025bcf284125a0089 100644
--- a/interface/web/sites/templates/ftp_user_edit.htm
+++ b/interface/web/sites/templates/ftp_user_edit.htm
@@ -13,8 +13,8 @@
             </div>
             <div class="form-group">
                 <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
-                <div class="col-sm-3">{tmpl_var name='username_prefix'}</div>
-                <div class="col-sm-6"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" /></div></div>
+                <div class="col-sm-2">{tmpl_var name='username_prefix'}</div>
+                <div class="col-sm-7"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
                 <div class="col-sm-6"><input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index 937604ace66124f58f1fd68b69408622ff22d705..4db4630ec494d0ad966414c626270f2722e4816c 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -21,8 +21,8 @@
             </div>
             <div class="form-group">
                 <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
-                <div class="col-sm-3">{tmpl_var name='username_prefix'} </div>
-                <div class="col-sm-6"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control"/></div></div>
+                <div class="col-sm-2">{tmpl_var name='username_prefix'} </div>
+                <div class="col-sm-7"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control"/></div></div>
             <div class="form-group">
                 <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
                 <div class="col-sm-6"><input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>