diff --git a/src/pages/profile.tsx b/src/pages/profile.tsx
index 52a20db3..12806fbb 100644
--- a/src/pages/profile.tsx
+++ b/src/pages/profile.tsx
@@ -82,7 +82,7 @@ function UserProfile({user, mutateUser}: Props) {
 	const [commercialRegistration, setCommercialRegistration] = useState<string | undefined>(
 		user.type === "agent" ? user.agentInformation?.commercialRegistration : undefined,
 	);
-	const [timezone, setTimezone] = useState<string>(user.demographicInformation?.timezone || 'UTC');
+	const [timezone, setTimezone] = useState<string>(user.demographicInformation?.timezone || "UTC");
 	const {groups} = useGroups();
 	const {users} = useUsers();
 
@@ -248,7 +248,7 @@ function UserProfile({user, mutateUser}: Props) {
 	);
 
 	const TimezoneInput = () => (
-		<div className="flex flex-col gap-3 w-1/2">
+		<div className="flex flex-col gap-3 w-full">
 			<label className="font-normal text-base text-mti-gray-dim">Timezone</label>
 			<TimezoneSelect value={timezone} onChange={setTimezone} />
 		</div>
@@ -293,27 +293,29 @@ function UserProfile({user, mutateUser}: Props) {
 								/>
 							</DoubleColumnRow>
 							<PasswordInput />
-
-							{user.type === "student" && (
-								<Input
-									type="text"
-									name="passport_id"
-									label="Passport/National ID"
-									onChange={(e) => setPassportID(e)}
-									placeholder="Enter National ID or Passport number"
-									value={passport_id}
-									required
-								/>
-							)}
 							{user.type === "agent" && <AgentInformationInput />}
 
 							<DoubleColumnRow>
 								<CountryInput />
 								<PhoneInput />
 							</DoubleColumnRow>
-							<DoubleColumnRow>
+
+							{user.type === "student" ? (
+								<DoubleColumnRow>
+									<Input
+										type="text"
+										name="passport_id"
+										label="Passport/National ID"
+										onChange={(e) => setPassportID(e)}
+										placeholder="Enter National ID or Passport number"
+										value={passport_id}
+										required
+									/>
+									<TimezoneInput />
+								</DoubleColumnRow>
+							) : (
 								<TimezoneInput />
-							</DoubleColumnRow>
+							)}
 
 							<Divider />