diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
index 817a7abfccb09..5891acb4e9126 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
@@ -179,7 +179,7 @@ export const CreateWorkspacePageViewExperimental: FC<
 	}, [error]);
 
 	useEffect(() => {
-		if (form.submitCount > 0 && form.errors) {
+		if (form.submitCount > 0 && Object.keys(form.errors).length > 0) {
 			workspaceNameInputRef.current?.scrollIntoView({
 				behavior: "smooth",
 				block: "center",
diff --git a/site/src/pages/CreateWorkspacePage/ExternalAuthButton.tsx b/site/src/pages/CreateWorkspacePage/ExternalAuthButton.tsx
index 5ce8cf4c3db1f..65e2de6dce2be 100644
--- a/site/src/pages/CreateWorkspacePage/ExternalAuthButton.tsx
+++ b/site/src/pages/CreateWorkspacePage/ExternalAuthButton.tsx
@@ -38,8 +38,12 @@ export const ExternalAuthButton: FC<ExternalAuthButtonProps> = ({
 					/>
 				)}
 				<p className="font-semibold text-sm m-0">{auth.display_name}</p>
-				{!auth.optional && (
-					<Badge size="sm" variant={error ? "destructive" : "warning"}>
+				{!auth.authenticated && !auth.optional && (
+					<Badge
+						size="sm"
+						border="none"
+						variant={error ? "destructive" : "warning"}
+					>
 						Required
 					</Badge>
 				)}