diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index de44b7058f..26b7df237f 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -38,12 +38,9 @@ html(itemscope, itemtype='http://schema.org/Product')
 		block scripts
 		
 	body
-		#ng-app(style="display: none;")
-			include layout/navbar
-			block content
-			include layout/footer
-		#ng-app-loading
-			i.fa.fa-spin.fa-refresh
+		include layout/navbar
+		block content
+		include layout/footer
 
 		- if (typeof(lookingForScribtex) != "undefined" && lookingForScribtex)
 			.modal.hide#scribtexModal
diff --git a/services/web/app/views/user/login.jade b/services/web/app/views/user/login.jade
index 6de69e36db..2693525b39 100644
--- a/services/web/app/views/user/login.jade
+++ b/services/web/app/views/user/login.jade
@@ -8,7 +8,7 @@ block content
 					.card
 						.page-header
 							h1 Login
-						form(async-form="login", action='/login')
+						form(async-form="login", action='/login', ng-cloak)
 							input(name='_csrf', type='hidden', value=csrfToken)
 							input(name='redir', type='hidden', value=redir)
 							form-messages
diff --git a/services/web/app/views/user/passwordReset.jade b/services/web/app/views/user/passwordReset.jade
index 1d5537e784..ee5492e9d4 100644
--- a/services/web/app/views/user/passwordReset.jade
+++ b/services/web/app/views/user/passwordReset.jade
@@ -11,7 +11,8 @@ block content
 						.messageArea
 						form(
 							async-form="password-reset-request",
-							action="/user/password/reset"
+							action="/user/password/reset",
+							ng-cloak
 						)
 							input(type="hidden", name="_csrf", value=csrfToken)
 							form-messages
diff --git a/services/web/app/views/user/register.jade b/services/web/app/views/user/register.jade
index b00a8c2fbd..34146237da 100644
--- a/services/web/app/views/user/register.jade
+++ b/services/web/app/views/user/register.jade
@@ -18,7 +18,7 @@ block content
 					.card
 						.page-header
 							h1 Register
-						form(async-form="register", action="/register")
+						form(async-form="register", action="/register", ng-cloak)
 							input(name='_csrf', type='hidden', value=csrfToken)
 							input(name='redir', type='hidden', value=redir)
 							form-messages
diff --git a/services/web/app/views/user/setPassword.jade b/services/web/app/views/user/setPassword.jade
index 8861f63f29..3e22c0a3c9 100644
--- a/services/web/app/views/user/setPassword.jade
+++ b/services/web/app/views/user/setPassword.jade
@@ -10,7 +10,8 @@ block content
 							h1 Reset your password
 						form(
 							async-form="password-reset",
-							action="/user/password/set"
+							action="/user/password/set",
+							ng-cloak
 						)
 							input(type="hidden", name="_csrf", value=csrfToken)
 							form-messages
diff --git a/services/web/public/coffee/app/main.coffee b/services/web/public/coffee/app/main.coffee
index 06c44cba61..b4c8c03271 100644
--- a/services/web/public/coffee/app/main.coffee
+++ b/services/web/public/coffee/app/main.coffee
@@ -3,6 +3,4 @@ define [
 	"user-details"
 	"directives/asyncForm"
 ], () ->
-	angular.bootstrap(document.getElementById("ng-app"), ["SharelatexApp"])
-	$("#ng-app").show()
-	$("#ng-app-loading").hide()
\ No newline at end of file
+	angular.bootstrap(document.body, ["SharelatexApp"])
\ No newline at end of file
diff --git a/services/web/public/stylesheets/app/base.less b/services/web/public/stylesheets/app/base.less
index e96126f7e1..c1de335fbb 100644
--- a/services/web/public/stylesheets/app/base.less
+++ b/services/web/public/stylesheets/app/base.less
@@ -1,6 +1,3 @@
-#ng-app-loading {
-	position: absolute;
-	top: 45%;
-	width: 100%;
-	text-align: center;
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+  display: none !important;
 }
\ No newline at end of file