diff --git a/apps/mobile-app/app/(tabs)/credentials/add-edit.tsx b/apps/mobile-app/app/(tabs)/credentials/add-edit.tsx
index a3fa871e6..0dab6e116 100644
--- a/apps/mobile-app/app/(tabs)/credentials/add-edit.tsx
+++ b/apps/mobile-app/app/(tabs)/credentials/add-edit.tsx
@@ -451,7 +451,6 @@ export default function AddEditCredentialScreen() : React.ReactNode {
       borderRadius: 8,
       flexDirection: 'row',
       marginBottom: 8,
-      marginTop: 16,
       paddingHorizontal: 12,
       paddingVertical: 8,
     },
@@ -633,6 +632,11 @@ export default function AddEditCredentialScreen() : React.ReactNode {
                 <View style={styles.section}>
                   <ThemedText style={styles.sectionTitle}>{t('credentials.loginCredentials')}</ThemedText>
 
+                  <ValidatedFormField
+                    control={control}
+                    name="Alias.Email"
+                    label={t('credentials.email')}
+                  />
                   <ValidatedFormField
                     control={control}
                     name="Username"
@@ -663,19 +667,14 @@ export default function AddEditCredentialScreen() : React.ReactNode {
                       }
                     ]}
                   />
-                  <TouchableOpacity style={styles.generateButton} onPress={handleGenerateRandomAlias}>
-                    <MaterialIcons name="auto-fix-high" size={20} color="#fff" />
-                    <ThemedText style={styles.generateButtonText}>{t('credentials.generateRandomAlias')}</ThemedText>
-                  </TouchableOpacity>
-                  <ValidatedFormField
-                    control={control}
-                    name="Alias.Email"
-                    label={t('credentials.email')}
-                  />
                 </View>
 
                 <View style={styles.section}>
                   <ThemedText style={styles.sectionTitle}>{t('credentials.alias')}</ThemedText>
+                  <TouchableOpacity style={styles.generateButton} onPress={handleGenerateRandomAlias}>
+                    <MaterialIcons name="auto-fix-high" size={20} color="#fff" />
+                    <ThemedText style={styles.generateButtonText}>{t('credentials.generateRandomAlias')}</ThemedText>
+                  </TouchableOpacity>
                   <ValidatedFormField
                     control={control}
                     name="Alias.FirstName"