diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index bac39ab1b..e8703bdfa 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -46,7 +46,7 @@
                 </core-show-password>
             </ion-item>
             <ion-button expand="block" type="submit" [disabled]="siteChecked && !isBrowserSSO && !credForm.valid"
-                class="ion-margin core-login-login-button">
+                class="ion-margin core-login-login-button ion-text-wrap">
                 {{ 'core.login.loginbutton' | translate }}
             </ion-button>
             <!-- Remove this once Ionic fixes this bug: https://github.com/ionic-team/ionic-framework/issues/19368 -->
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 7854dfa37..8c6b71f6e 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -51,20 +51,15 @@
                     </ion-input>
                 </core-show-password>
             </ion-item>
-            <ion-grid class="ion-padding">
-                <ion-row>
-                    <ion-col>
-                        <ion-button expand="block" fill="outline" (click)="cancel($event)">
-                            {{ 'core.login.cancel' | translate }}
-                        </ion-button>
-                    </ion-col>
-                    <ion-col>
-                        <ion-button type="submit" expand="block" [disabled]="!credForm.valid">
-                            {{ 'core.login.loginbutton' | translate }}
-                        </ion-button>
-                    </ion-col>
-                </ion-row>
-            </ion-grid>
+            <div class="adaptable-buttons-row">
+                <ion-button expand="block" fill="outline" (click)="cancel($event)" class="ion-margin ion-text-wrap">
+                    {{ 'core.login.cancel' | translate }}
+                </ion-button>
+                <ion-button type="submit" expand="block" [disabled]="!credForm.valid"
+                    class="ion-margin core-login-login-button ion-text-wrap">
+                    {{ 'core.login.loginbutton' | translate }}
+                </ion-button>
+            </div>
 
             <ng-container *ngIf="showScanQR">
                 <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>