diff --git a/frontend/src/views/PasswordRecovery/PasswordRecovery.css b/frontend/src/views/PasswordRecovery/PasswordRecovery.css
index 607e8e6..08c187d 100644
--- a/frontend/src/views/PasswordRecovery/PasswordRecovery.css
+++ b/frontend/src/views/PasswordRecovery/PasswordRecovery.css
@@ -558,3 +558,23 @@
   min-width: 0;
   margin-left: 0 !important;
 }
+
+.recovery-form :deep(.el-form-item:has(input[autocomplete="one-time-code"])) {
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr);
+  align-items: center;
+  gap: 12px;
+}
+
+.recovery-form :deep(.el-form-item:has(input[autocomplete="one-time-code"]) .el-form-item__label) {
+  width: auto !important;
+  margin: 0;
+  padding: 0;
+  line-height: 1.4;
+  white-space: nowrap;
+}
+
+.recovery-form :deep(.el-form-item:has(input[autocomplete="one-time-code"]) .el-form-item__content) {
+  min-width: 0;
+  margin-left: 0 !important;
+}
diff --git a/frontend/src/views/PublicPasswordReset/PublicPasswordReset.css b/frontend/src/views/PublicPasswordReset/PublicPasswordReset.css
index 9b1613d..3d27c48 100644
--- a/frontend/src/views/PublicPasswordReset/PublicPasswordReset.css
+++ b/frontend/src/views/PublicPasswordReset/PublicPasswordReset.css
@@ -255,3 +255,25 @@ button:not(:disabled):hover {
     width: 100%;
   }
 }
+
+.public-recovery-form:has(.recovery-code-row) {
+  grid-template-columns: auto minmax(0, 1fr);
+}
+
+.public-recovery-form:has(.recovery-code-row) > strong,
+.public-recovery-form:has(.recovery-code-row) > .public-recovery-copy,
+.public-recovery-form:has(.recovery-code-row) > .recovery-methods,
+.public-recovery-form:has(.recovery-code-row) > .public-recovery-status,
+.public-recovery-form:has(.recovery-code-row) > .public-recovery-actions {
+  grid-column: 1 / -1;
+}
+
+.public-recovery-form:has(.recovery-code-row) > label[for="public-recovery-code"] {
+  align-self: center;
+  margin-top: 0;
+  white-space: nowrap;
+}
+
+.public-recovery-form:has(.recovery-code-row) > .recovery-code-row {
+  min-width: 0;
+}
diff --git a/frontend/src/views/components/SecuritySettings/TOTPSettings/TOTPSettings.css b/frontend/src/views/components/SecuritySettings/TOTPSettings/TOTPSettings.css
index 3f511cc..2a84edf 100644
--- a/frontend/src/views/components/SecuritySettings/TOTPSettings/TOTPSettings.css
+++ b/frontend/src/views/components/SecuritySettings/TOTPSettings/TOTPSettings.css
@@ -69,3 +69,26 @@
 .totp-disable {
   max-width: 360px;
 }
+
+.totp-enrollment :deep(.el-form-item),
+.totp-disable :deep(.el-form-item) {
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr);
+  align-items: center;
+  gap: 12px;
+}
+
+.totp-enrollment :deep(.el-form-item__label),
+.totp-disable :deep(.el-form-item__label) {
+  width: auto !important;
+  margin: 0;
+  padding: 0;
+  line-height: 1.4;
+  white-space: nowrap;
+}
+
+.totp-enrollment :deep(.el-form-item__content),
+.totp-disable :deep(.el-form-item__content) {
+  min-width: 0;
+  margin-left: 0 !important;
+}