diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index ff80af58e3f66e07e5cd90e6e5a19020db292557..290ae30a96e5a90293699d4caa7628ec4745b431 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -52,18 +52,23 @@
                     {tmpl_var name='type'}
                 </select></div>
             </div>
-            <div class="form-group">
+			<div class="form-group">
                 <label for="database_name" class="col-sm-3 control-label">{tmpl_var name='database_name_txt'}</label>
-                <p class="prefix">{tmpl_var name='database_name_prefix'}</p>
-                <tmpl_if name="edit_disabled">
-                    <div class="col-sm-9"><input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" disabled="disabled" /></div><input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
-                    <tmpl_else>
-                        <div class="col-sm-9"><input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" /></div></tmpl_if>
+                <div class="col-sm-9">
+					<div class="input-group">
+						<span class="input-group-addon" id="database_name-desc">{tmpl_var name='database_name_prefix'}</span>
+						<tmpl_if name="edit_disabled">
+						<input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" disabled="disabled" /><input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
+						<tmpl_else>
+						<input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" aria-describedby="database_name-desc" />
+						</tmpl_if>
+					</div>
+				</div>
             </div>
 			<div class="form-group">
-				<label for="database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
-				<div class="col-sm-6"><input type="text" name="database_quota" id="database_quota" value="{tmpl_var name='limit_database_quota'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;MB
-			</div></div>
+                <label for="database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
+                <div class="col-sm-9"><div class="input-group"><input type="text" name="database_quota" id="quota" value="{tmpl_var name='database_quota'}" class="form-control" aria-describedby="database_quota-desc" /><span class="input-group-addon" id="database_quota-desc">MB</span></div></div>
+            </div>
             <div class="form-group">
                 <label for="database_user_id" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
                 <div class="col-sm-9"><select name="database_user_id" id="database_user_id" class="form-control">
@@ -72,9 +77,11 @@
             </div>
             <div class="form-group">
                 <label for="database_ro_user_id" class="col-sm-3 control-label">{tmpl_var name='database_ro_user_txt'}</label>
-                <div class="col-sm-9"><select name="database_ro_user_id" id="database_ro_user_id" class="form-control">
+                <div class="col-sm-9"><select name="database_ro_user_id" id="database_ro_user_id" class="form-control" aria-describedby="database_ro_user_id-help">
                     {tmpl_var name='database_ro_user_id'}
-                </select></div>&nbsp;{tmpl_var name='optional_txt'}
+                </select>
+				<span id="database_ro_user_id-help" class="help-block">{tmpl_var name='optional_txt'}</span>
+				</div>
             </div>
             <div class="form-group">
                 <tmpl_if name="edit_disabled">
diff --git a/interface/web/sites/templates/database_user_edit.htm b/interface/web/sites/templates/database_user_edit.htm
index a67985936d322625397d09ca02bd5bd9ee359eb1..e1a27d49acf4ca50b4fd422fac261305a864cbbf 100644
--- a/interface/web/sites/templates/database_user_edit.htm
+++ b/interface/web/sites/templates/database_user_edit.htm
@@ -21,13 +21,25 @@
                     </select></div>
                 </div>
             </tmpl_if>
-            <div class="form-group">
+			<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-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">
+                <div class="col-sm-9">
+					<div class="input-group">
+						<span class="input-group-addon" id="database_user-desc">{tmpl_var name='database_user_prefix'}</span>
+						<input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" aria-describedby="database_user-desc" />
+					</div>
+				</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>
+                <div class="col-sm-9">
+				<div class="input-group">
+					<input type="database_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');" />
+					<span class="input-group-btn">
+						<button class="btn btn-default" type="button" onclick="generatePassword('database_password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
+					</span>
+				</div>
+				</div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>