diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
index 6aeb58c9851..68c56c125da 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
@@ -2,8 +2,8 @@
   <bit-section-header>
     <h2 bitTypography="h6">{{ "loginCredentials" | i18n }}</h2>
   </bit-section-header>
-  <bit-card>
-    <bit-form-field [disableMargin]="!cipher.login.password && !cipher.login.totp">
+  <bit-card class="[&_bit-form-field:last-of-type]:tw-mb-0">
+    <bit-form-field *ngIf="cipher.login.username">
       <bit-label>
         {{ "username" | i18n }}
       </bit-label>
@@ -26,7 +26,7 @@
         data-testid="toggle-username"
       ></button>
     </bit-form-field>
-    <bit-form-field [disableMargin]="!cipher.login.totp">
+    <bit-form-field *ngIf="cipher.login.password">
       <bit-label>{{ "password" | i18n }}</bit-label>
       <input
         readonly
@@ -65,13 +65,16 @@
         data-testid="copy-password"
       ></button>
     </bit-form-field>
-    <ng-container *ngIf="showPasswordCount && passwordRevealed">
+    <div
+      *ngIf="showPasswordCount && passwordRevealed"
+      [ngClass]="{ 'tw-mt-3': !cipher.login.totp }"
+    >
       <bit-color-password
         [password]="cipher.login.password"
         [showCount]="true"
       ></bit-color-password>
-    </ng-container>
-    <bit-form-field disableMargin *ngIf="cipher.login.totp">
+    </div>
+    <bit-form-field *ngIf="cipher.login.totp">
       <bit-label
         >{{ "verificationCodeTotp" | i18n }}
         <span