diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php
index b9af5e01..25216474 100644
--- a/themes/default/checkout.blade.php
+++ b/themes/default/checkout.blade.php
@@ -216,7 +216,7 @@
 
       <div class="col-12 col-md-4 right-column">
         @if (!current_customer())
-          <div class="card total-wrap mb-4 fixed-top-line p-lg-4 shadow-sm">
+          <div class="card total-wrap mb-4 p-lg-4 shadow-sm">
             <div class="card-header">
               <h5 class="mb-0">{{ __('shop/login.login_and_sign') }}</h5>
             </div>
diff --git a/themes/default/shared/address-form.blade.php b/themes/default/shared/address-form.blade.php
index 1b8cb7a1..96da48bb 100644
--- a/themes/default/shared/address-form.blade.php
+++ b/themes/default/shared/address-form.blade.php
@@ -49,7 +49,7 @@
         <el-form-item label="{{ __('address.address_2') }}">
           <el-input v-model="form.address_2"></el-input>
         </el-form-item>
-        <el-form-item label="{{ __('address.default') }}">
+        <el-form-item label="{{ __('address.default') }}" v-if="isLogin">
           <el-switch
             v-model="form.default"
             >
@@ -126,7 +126,8 @@
 
       source: {
         countries: @json($countries ?? []),
-        zones: []
+        zones: [],
+        isLogin: config.isLogin,
       },
     }
   },