diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
index b7e34e07b15f160097a88d5071eed692072a822a..6f18f5aa59b030892860bb9eff74cc6131513b4a 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
@@ -20,5 +20,5 @@
                 <span><?php echo __('Proceed to Checkout') ?></span>
     </button>
     <!-- /Temp MAGETWO-36239 markup -->
-    <button type="button" class="action secondary proceed-to-checkout" href="#"><span><?php echo __('Sign in and Checkout') ?></span></button>
+    <button type="button" class="action secondary proceed-to-checkout"><span><?php echo __('Sign in and Checkout') ?></span></button>
 <?php endif?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/sign-in.phtml b/app/code/Magento/Checkout/view/frontend/templates/sign-in.phtml
index 6ac898aba4163797beade07bbd36ebb5e86fd629..5e41ca82a2795090aca2a5a70f564b81e40bb68d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/sign-in.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/sign-in.phtml
@@ -68,7 +68,7 @@
                     </div>
                     <div class="actions-toolbar">
                         <div class="primary"><button type="submit" class="action action-login secondary" name="send" id="send2"><span><?php echo __('Sign In') ?></span></button></div>
-                        <div class="secondary"><a class="action" href="<?php echo $block->getForgotPasswordUrl() ?>"><span><?php echo __('Forgot Your Password?') ?></span></a></div>
+                        <div class="secondary"><a class="action" href="<?php echo $block->getForgotPasswordUrl() ?>"><span><?php echo __('Forgot Password?') ?></span></a></div>
                     </div>
                 </div>
             </form>
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
index de193cdab2dfa30fb3e37f6cde3475642dd316ce..12df1a22efb02283ce0449dbb966633a96e0260d 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
@@ -53,7 +53,7 @@
         }
         .actions-toolbar {
             margin-bottom: @indent__xs;
-            & > .secondary {
+            > .secondary {
                 padding-top: @indent__m;
                 text-align: left;
             }
@@ -87,7 +87,7 @@
                     .css(min-width, @block-auth__or-label__size);
                     background: @color-white;
                     border-radius: 50%;
-                    border: .1rem solid @color-gray-light5;
+                    border: 1px solid @color-gray-light5;
                     box-sizing: border-box;
                     color: @color-gray-light5;
                     content: attr(data-label);
@@ -117,12 +117,12 @@
         text-align: left;
         top: 100%;
         transform-origin: 0 0;
-        transform:  scale(1,0);
+        transform: scale(1,0);
         transition: transform linear .1s;
         width: 100%;
         &._show {
             .css(z-index, @dropdown-list__z-index);
-            transform:  scale(1,1);
+            transform: scale(1,1);
         }
     }
     .authentication-wrapper {
@@ -136,7 +136,7 @@
             margin-bottom: @indent__m;
         }
         .actions-toolbar {
-            & > .primary {
+            > .primary {
                 display: inline;
                 float: right;
                 margin-right: 0;
@@ -144,7 +144,7 @@
                     margin-right: 0;
                 }
             }
-            & > .secondary {
+            > .secondary {
                 float: left;
                 margin-right: 2rem;
                 padding-top: 1rem;
diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
index 95b777e245be442bc97819c01ee56b1fdf1215af..c19a66131c9b3957ce5461cd88f737e6dc691db7 100644
--- a/lib/web/css/source/components/_modals.less
+++ b/lib/web/css/source/components/_modals.less
@@ -105,10 +105,12 @@
 
 //
 
-body._has-modal {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+body {
+    &._has-modal {
+        height: 100%;
+        overflow: hidden;
+        width: 100%;
+    }
 }
 
 // Modals overlay