diff --git a/src/extensions/components/legalPageWrapper/legalPageWrapper.styles.scss b/src/extensions/components/legalPageWrapper/legalPageWrapper.styles.scss
index 58105e7de..e6c6cbaa4 100644
--- a/src/extensions/components/legalPageWrapper/legalPageWrapper.styles.scss
+++ b/src/extensions/components/legalPageWrapper/legalPageWrapper.styles.scss
@@ -6,6 +6,7 @@
 	}
 
 	.template {
+		width: 100%;
 		max-width: 700px;
 
 		h2,
diff --git a/src/extensions/components/registration/Registration.tsx b/src/extensions/components/registration/Registration.tsx
index 6122531b6..a904c4291 100644
--- a/src/extensions/components/registration/Registration.tsx
+++ b/src/extensions/components/registration/Registration.tsx
@@ -356,6 +356,11 @@ export const Registration = () => {
 												disabled={disabledNextButton}
 												variant="contained"
 												onClick={onRegisterClick}
+												type={
+													disabledNextButton
+														? 'button'
+														: 'submit'
+												}
 											>
 												{t('registration.register')}
 											</Button>
@@ -366,6 +371,11 @@ export const Registration = () => {
 												variant="contained"
 												onClick={onNextClick}
 												sx={{ width: 'unset' }}
+												type={
+													disabledNextButton
+														? 'button'
+														: 'submit'
+												}
 											>
 												{t('registration.next')}
 											</Button>
diff --git a/src/extensions/components/registration/accountData/AccountData.tsx b/src/extensions/components/registration/accountData/AccountData.tsx
index 86cd33c09..45e4d6167 100644
--- a/src/extensions/components/registration/accountData/AccountData.tsx
+++ b/src/extensions/components/registration/accountData/AccountData.tsx
@@ -200,6 +200,7 @@ export const AccountData: VFC<{
 				}
 				onInputChange={setRepeatPassword}
 				value={repeatPassword}
+				info="&nbsp;"
 				label={t('registration.account.repeatPassword.label')}
 				isValueValid={async (val) =>
 					val === password && password.length > 0
@@ -209,7 +210,7 @@ export const AccountData: VFC<{
 					'registration.account.repeatPassword.success'
 				)}
 			/>
-			<FormGroup sx={{ mt: '40px' }}>
+			<FormGroup sx={{ mt: '20px' }}>
 				<FormControlLabel
 					onClick={() => {
 						setDataProtectionChecked(!dataProtectionChecked);
diff --git a/src/extensions/components/registration/agencySelection/AgencySelectionResults.tsx b/src/extensions/components/registration/agencySelection/AgencySelectionResults.tsx
index b7e5c8642..bc5acd690 100644
--- a/src/extensions/components/registration/agencySelection/AgencySelectionResults.tsx
+++ b/src/extensions/components/registration/agencySelection/AgencySelectionResults.tsx
@@ -50,11 +50,14 @@ export const AgencySelectionResults = ({
 	const { setDisabledNextButton, registrationData } =
 		useContext(RegistrationContext);
 	const { consultant: preselectedConsultant } = useContext(UrlParamsContext);
-
 	const [selectedAgency, setSelectedAgency] = useState<AgencyDataInterface>(
 		registrationData?.agency
 	);
 
+	const onlyExternalAgencies = results?.every((agency) => agency.external);
+	const isSingleResultAndNotOnlyExternal =
+		results?.length === 1 && !onlyExternalAgencies;
+
 	useEffect(() => {
 		if (
 			// only external agencies
@@ -100,8 +103,6 @@ export const AgencySelectionResults = ({
 		}
 	}, [selectedAgency, results, onChange, setDisabledNextButton, zipcode]);
 
-	const onlyExternalAgencies = results?.every((agency) => agency.external);
-
 	return (
 		<>
 			{!!results && !preselectedConsultant && (
@@ -213,7 +214,7 @@ export const AgencySelectionResults = ({
 			)}
 
 			{/* one Result */}
-			{results?.length === 1 && !onlyExternalAgencies && (
+			{isSingleResultAndNotOnlyExternal && (
 				<FormControl sx={{ width: '100%' }}>
 					<RadioGroup
 						data-cy="agency-selection-radio-group"
diff --git a/src/extensions/components/registration/topicSelection/TopicSelection.tsx b/src/extensions/components/registration/topicSelection/TopicSelection.tsx
index 4eaafd865..f40221e5c 100644
--- a/src/extensions/components/registration/topicSelection/TopicSelection.tsx
+++ b/src/extensions/components/registration/topicSelection/TopicSelection.tsx
@@ -367,6 +367,7 @@ const TopicSelect = ({
 				value={topic?.id}
 				control={
 					<Radio
+						tabIndex={0}
 						onClick={onChange}
 						checked={checked}
 						checkedIcon={
diff --git a/src/extensions/components/registration/zipcodeInput/ZipcodeInput.tsx b/src/extensions/components/registration/zipcodeInput/ZipcodeInput.tsx
index 4f132b2a9..5a31e1c81 100644
--- a/src/extensions/components/registration/zipcodeInput/ZipcodeInput.tsx
+++ b/src/extensions/components/registration/zipcodeInput/ZipcodeInput.tsx
@@ -25,7 +25,11 @@ export const ZipcodeInput: VFC<{
 	useEffect(() => {
 		if (REGISTRATION_DATA_VALIDATION.zipcode.validation(value)) {
 			setDisabledNextButton(false);
-			onChange({ zipcode: value });
+			onChange({
+				zipcode: value,
+				agencyId: undefined,
+				agency: undefined
+			});
 		} else {
 			setDisabledNextButton(true);
 		}