diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl
index cb9c612643..2af1117c10 100644
--- a/src/views/admin/settings/post.tpl
+++ b/src/views/admin/settings/post.tpl
@@ -41,6 +41,14 @@
 				<label>Minimum Post Length</label>
 				<input type="number" class="form-control" value="8" data-field="minimumPostLength">
 			</div>
+		</form>
+	</div>
+</div>
+
+<div class="panel panel-default">
+	<div class="panel-heading">Signature Settings</div>
+	<div class="panel-body">
+		<form>
 			<div class="checkbox">
 				<label>
 					<input type="checkbox" data-field="disableSignatures"> <strong>Disable signatures</strong>
@@ -56,6 +64,10 @@
 					<input type="checkbox" data-field="signatures:disableImages"> <strong>Disable images in signatures</strong>
 				</label>
 			</div>
+			<div class="form-group">
+				<label>Maximum Signature Length</label>
+				<input type="text" class="form-control" value="255" data-field="maximumSignatureLength">
+			</div>
 		</form>
 	</div>
 </div>
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index 800940c090..b76f04476e 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -133,10 +133,6 @@
 				<label>Minimum Password Length</label>
 				<input type="text" class="form-control" value="6" data-field="minimumPasswordLength">
 			</div>
-			<div class="form-group">
-				<label>Maximum Signature Length</label>
-				<input type="text" class="form-control" value="255" data-field="maximumSignatureLength">
-			</div>
 			<div class="form-group">
 				<label>Forum Terms of Use <small>(Leave blank to disable)</small></label>
 				<textarea class="form-control" data-field="termsOfUse"></textarea>