diff --git a/core/css/guest.css b/core/css/guest.css
index d1cddf0b3811ac12757b98fa65476175a6073c66..a0acb2fc7299bca3c08565b086876de350dd7b1a 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -1071,12 +1071,9 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 /* FOOTER */
 footer {
     background-color: #ffffff;
-    position: absolute;
-    right: 5%;
-    bottom: 0;
-    padding-bottom: 15px;
-    max-width: 350px;
+    width: 100%;
     transition: all 0.3s linear;
+    padding-bottom: 20px;
 }
 
 footer .info .entity-name {
@@ -1130,7 +1127,7 @@ a.legal {
     width: 50%;
     margin: 0 auto;
     margin-top: 0;
-	padding: 0;
+    padding: 0;
 }
 #body-login #user,
 #body-login #password,
@@ -1382,7 +1379,6 @@ a.legal {
 }
 .v-align header{
     width: 100%;
-    margin-top: 10vh;
 }
 .warning-messsage header{
     margin-top: 0;
@@ -1398,12 +1394,15 @@ a.legal {
 .v-align main{
     width: 100%;
     margin: 0 auto;
-    margin-bottom: 15vh;
 }
 .warning-messsage main{
     margin-bottom: 0;
     max-width: 90%;
 }
+.warning-messsage main{
+    margin-bottom: 0;
+    max-width: 60%;
+}
 #lost-password{
     color: #0086FF !important;
     font-family: 'Montserrat';
@@ -1438,12 +1437,25 @@ a.legal {
 .pos-fixed{
     position: fixed !important;
 }
+#body-login > .wrapper > footer{
+    display: none;
+}
+.v-align > footer{
+    display: block;
+    margin-top: 30px;
+}
 @media only screen and (max-width: 1440px) {
     .banner-right-align {
         width: 65%;
     }
 }
 @media only screen and (max-width: 1050px) {
+    .v-align footer{
+        display: none;
+    }
+    #body-login > .wrapper > footer{
+        display: block;
+    }
     .width0{
         width: 0 !important;
         height: 0 !important;
@@ -1452,9 +1464,9 @@ a.legal {
         max-width: 80%;
     }
     #body-login .v-align{
-        height: 70%;
         overflow: hidden;
         width: 70%;
+        height: auto;
     }
     .banner-right-align {
         -webkit-box-ordinal-group: 2;
@@ -1463,6 +1475,7 @@ a.legal {
         width: 100%;
         height: 60%;
         position: relative;
+        clear: both;
     }
     .banner-content-create-button{
         text-align: center;
@@ -1500,6 +1513,10 @@ a.legal {
     .banner-content-why-murena{
         margin: 5% 0 5% 0;
     }
+    .warning-messsage main{
+        max-width: 90%;
+        overflow-x: auto;
+    }
 }
 @media only screen and (max-width: 640px) {
     .wrapper{
@@ -1527,6 +1544,9 @@ a.legal {
     #body-login .warning-messsage {
         width: 80%;
     }
+    .warning-messsage main{
+        max-width: 90%;
+    }
 }
 @media only screen and (max-width: 375px) {
     .banner-right-align{
@@ -1562,4 +1582,6 @@ a.legal {
 .have-an-account a{
     color: #0086ff !important;
 }
-
+.v-align > footer p.info {
+    height: 40%;
+}
diff --git a/core/css/server.css b/core/css/server.css
index bceb8b9f07aade027086ff1081e3bac67d9c48c9..f55145c07d10ae4ac392eeea15504da3bcbbfcd2 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -1716,9 +1716,6 @@
   button#quotaincreasebutton {
       margin-top: 15px !important;
   }
-  .warning-messsage footer {
-      position: fixed;
-  }
   @media only screen and (max-width: 640px) {
       .new-icons .color-icons {
           height: 50px;
diff --git a/defaults.php b/defaults.php
index 08beeca141de6f186f9eb192dac7ad73358efbc4..a43ac7eafa0fa4c727ead5fa53a216193f730dc7 100644
--- a/defaults.php
+++ b/defaults.php
@@ -115,7 +115,7 @@ class OC_Theme {
 	 * @return string long footer
 	 */
 	public function getLongFooter() {
-		$footer = '<p>'.(\OC::$server->getL10N('core')->t('Copyright')).' © ' . date('Y') .' '.$this->getName() .'. '.(\OC::$server->getL10N('core')->t('All Rights Reserved')).'.</p>' ;
+		$footer = '<p>'.(\OC::$server->getL10N('core')->t('Copyright')).' © ' . date('Y') .' '.$this->getName() .'.</p><p> '.(\OC::$server->getL10N('core')->t('All Rights Reserved')).'.</p>' ;
 		$footer .= '<p>'.' <a href="' . $this->getTermsUrl() . '" target="_blank"> '.(\OC::$server->getL10N('core')->t('Terms & Conditions')).' </a>';
 		$footer .= ' - '.' <a href="' . $this->getPrivacyUrl() . '" target="_blank"> '.(\OC::$server->getL10N('core')->t('Privacy Policy')).' </a> </p>';