diff --git a/templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserForm.js b/templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserForm.js
index 68ae3be445..b20233f431 100644
--- a/templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserForm.js
+++ b/templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserForm.js
@@ -138,7 +138,7 @@ function CreateUpdateUserForm({ editingUser = {}, submit, remove }) {
                   <Input
                     abpInput
                     ref={emailRef}
-                    onSubmitEditing={() => passwordRef.current._root.focus()}
+                    onSubmitEditing={() => phoneNumberRef.current._root.focus()}
                     returnKeyType="next"
                     onChangeText={handleChange('email')}
                     onBlur={handleBlur('email')}
@@ -151,7 +151,8 @@ function CreateUpdateUserForm({ editingUser = {}, submit, remove }) {
                   <Label abpLabel>{i18n.t('AbpIdentity::PhoneNumber')}</Label>
                   <Input
                     abpInput
-                    ref={passwordRef}
+                    ref={phoneNumberRef}
+                    onSubmitEditing={() => passwordRef.current._root.focus()}
                     returnKeyType={!editingUser.id ? 'next' : 'default'}
                     onChangeText={handleChange('phoneNumber')}
                     onBlur={handleBlur('phoneNumber')}
diff --git a/templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserScreen.js b/templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserScreen.js
index cfdf9347aa..65313edf37 100644
--- a/templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserScreen.js
+++ b/templates/app/react-native/src/screens/CreateUpdateUser/CreateUpdateUserScreen.js
@@ -23,11 +23,11 @@ function CreateUpdateUserScreen({ navigation, route, startLoading, stopLoading }
     }
   }, []);
 
-  const submit = data => {
+  const submit = (data) => {
     startLoading({ key: 'saveUser' });
     let request;
     if (data.id) {
-      request = updateUser(data, userId)
+      request = updateUser(data, userId);
     } else {
       request = createUser(data);
     }
@@ -61,7 +61,7 @@ CreateUpdateUserScreen.propTypes = {
 
 export default connectToRedux({
   component: CreateUpdateUserScreen,
-  stateProps: state => ({ loading: createLoadingSelector()(state) }),
+  stateProps: (state) => ({ loading: createLoadingSelector()(state) }),
   dispatchProps: {
     startLoading: LoadingActions.start,
     stopLoading: LoadingActions.stop,