diff --git a/settings/src/components/email-address.js b/settings/src/components/email-address.js
index 173f1a2c..38d39489 100644
--- a/settings/src/components/email-address.js
+++ b/settings/src/components/email-address.js
@@ -108,17 +108,11 @@ export default function EmailAddress() {
 				<Button
 					onClick={ handleSave }
 					disabled={ ! hasEdits || isSaving }
-					isPrimary={ hasEdits }
-					isSecondary={ ! hasEdits }
+					isPrimary={ hasEdits && ! justChangedEmail }
+					isSecondary={ ! hasEdits || justChangedEmail }
+					isBusy={ isSaving && ! justChangedEmail }
 				>
-					{ isSaving ? (
-						<>
-							<Spinner />
-							Updating
-						</>
-					) : (
-						'Update Email Address'
-					) }
+					{ isSaving && ! justChangedEmail ? 'Updating' : 'Update Email Address' }
 				</Button>
 			</p>
 		</>
diff --git a/settings/src/components/email-address.scss b/settings/src/components/email-address.scss
index 356c7f52..de1d4b3c 100644
--- a/settings/src/components/email-address.scss
+++ b/settings/src/components/email-address.scss
@@ -1,7 +1,13 @@
 .wporg-2fa__email {
+	.components-notice.actions-on-right {
+		margin-bottom: 16px;
+	}
+
 	/* Align the actions in a <Notice /> to the right */
 	.components-notice.actions-on-right > div {
 		display: flex;
+		margin-right: 0;
+
 		&> p {
 			flex-grow: 1;
 			margin: initial; /* wporg-support adds top padding to <p> causing button alignment issues. */