diff --git a/public/css/style.less b/public/css/style.less
index 4712df0290..d3697fdb95 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -275,4 +275,8 @@ footer.footer {
 	vertical-align: 17%;
 }
 
+.modal {
+	overflow-y: hidden;
+}
+
 //END: FIXES FOR BS3, may need to remove these when we get out of the RC releases
\ No newline at end of file
diff --git a/public/src/forum/register.js b/public/src/forum/register.js
index a312a542b2..89ee708e5a 100644
--- a/public/src/forum/register.js
+++ b/public/src/forum/register.js
@@ -13,14 +13,18 @@
 
 	function showError(element, msg) {
 		element.html(msg);
-		element.parent().removeClass('alert-success').addClass('alert-danger');
+		element.parent()
+			.removeClass('alert-success')
+			.addClass('alert-danger');
 		element.show();
 		validationError = true;
 	}
 
 	function showSuccess(element, msg) {
 		element.html(msg);
-		element.parent().removeClass('alert-danger').addClass('alert-success');
+		element.parent()
+			.removeClass('alert-danger')
+			.addClass('alert-success');
 		element.show();
 	}
 
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index 433987b6e4..11b04261b9 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -2,20 +2,23 @@
 
 	</div><!--END container -->
 
-	<div id="disconnect-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-		<div class="modal-header">
-			<h3 id="myModalLabel">Socket Disconnect</h3>
-		</div>
-		<div class="modal-body">
-			<span id="disconnect-text">Looks like you disconnected, try reloading the page.</span>
-		</div>
-		<div class="modal-footer">
-			<a id="reload-button" href="/" class="btn btn-primary">Reload</a>
-		</div>
-	</div>
-
+	<div id="disconnect-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="You were disconnected" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3 id="myModalLabel">Socket Disconnect</h3>
+				</div>
+				<div class="modal-body">
+					<span id="disconnect-text">Looks like you disconnected, try reloading the page.</span>
+				</div>
+				<div class="modal-footer">
+					<a id="reload-button" href="/" class="btn btn-primary">Reload</a>
+				</div>
+			</div><!-- /.modal-content -->
+		</div><!-- /.modal-dialog -->
+	</div><!-- /.modal -->
 
-	<div id="chat-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+	<div id="chat-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Chat" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">