diff --git a/src/components/home/contentNoAuth.vue b/src/components/home/contentNoAuth.vue
index a491329e..ad8dc789 100644
--- a/src/components/home/contentNoAuth.vue
+++ b/src/components/home/contentNoAuth.vue
@@ -1,15 +1,17 @@
 <template>
-	<div class="noauth-container">
-		<img alt="Vikunja" src="/images/logo-full.svg"/>
-		<div class="message is-info" v-if="motd !== ''">
-			<div class="message-header">
-				<p>Info</p>
-			</div>
-			<div class="message-body">
-				{{ motd }}
+	<div class="no-auth-wrapper">
+		<div class="noauth-container">
+			<img alt="Vikunja" src="/images/logo-full.svg"/>
+			<div class="message is-info" v-if="motd !== ''">
+				<div class="message-header">
+					<p>Info</p>
+				</div>
+				<div class="message-body">
+					{{ motd }}
+				</div>
 			</div>
+			<router-view/>
 		</div>
-		<router-view/>
 	</div>
 </template>
 
diff --git a/src/styles/theme/content.scss b/src/styles/theme/content.scss
index 35e3f2c9..82e27b09 100644
--- a/src/styles/theme/content.scss
+++ b/src/styles/theme/content.scss
@@ -29,18 +29,23 @@
   }
 }
 
-.noauth-container {
-  max-width: 450px;
-  width: 100%;
-  margin: 0 auto;
-  padding: 1rem;
+.no-auth-wrapper {
+  background: url('../../public/images/llama.svg') no-repeat bottom left fixed $light-background;
+  min-height: 100vh;
 
-  @media screen and (max-width: 450px) {
-    .login-buttons {
-      flex-direction: column;
+  .noauth-container {
+    max-width: 450px;
+    width: 100%;
+    margin: 0 auto;
+    padding: 1rem;
 
-      .control:first-child {
-        margin-bottom: 1rem;
+    @media screen and (max-width: 450px) {
+      .login-buttons {
+        flex-direction: column;
+
+        .control:first-child {
+          margin-bottom: 1rem;
+        }
       }
     }
   }
diff --git a/src/styles/theme/theme.scss b/src/styles/theme/theme.scss
index 09aae8b5..18c74006 100644
--- a/src/styles/theme/theme.scss
+++ b/src/styles/theme/theme.scss
@@ -25,14 +25,8 @@
 }
 
 body {
-  background: url("../../public/images/llama.svg") no-repeat bottom left fixed $light-background;
+  background: $light-background;
   min-height: 100vh;
-
-  @media screen and (max-width: $tablet) {
-    &:not(.has-llama) {
-      background: $light-background;
-    }
-  }
 }
 
 h1,