diff --git a/src/components/Forms/DropdownForm.tsx b/src/components/Forms/DropdownForm.tsx
index ab3fbf889271091238343c378340b8bf627a9f2f..3554f48f8c74823815f40902196c692841bce4db 100644
--- a/src/components/Forms/DropdownForm.tsx
+++ b/src/components/Forms/DropdownForm.tsx
@@ -36,6 +36,7 @@ const DropdownForm = ({
   }
   return (
     <DropDownPicker
+      listMode={"MODAL"}
       open={open}
       value={value}
       items={items}
diff --git a/src/screens/auth/InputForgotPassword.tsx b/src/screens/auth/InputForgotPassword.tsx
index 2776b37f2d10c3b376236bfa01e92c21fa6215b8..53b55b1a88f5cc8fa61e6fb6f05d04ca501b1a42 100644
--- a/src/screens/auth/InputForgotPassword.tsx
+++ b/src/screens/auth/InputForgotPassword.tsx
@@ -1,7 +1,7 @@
 import { useNavigation } from "@react-navigation/core";
 import React from "react";
 import { useState } from "react";
-import { StyleSheet, View, Text } from "react-native";
+import { StyleSheet, View, Text, Alert } from "react-native";
 import Colors from "../../constants/Colors";
 import { RootTabScreenProps } from "../../types/navigation";
 import PlainForm from "../../components/Forms/PlainForm";
@@ -10,6 +10,7 @@ import { MaterialIcons } from "@expo/vector-icons";
 import MainButton from "../../components/button/MainButton";
 import firebase from "firebase";
 import { validateEmail } from "../../helpers/Validators";
+import { forgotPassword } from "../../service/firebase/auth";
 
 export default function InputForgotPassword({
   navigation,
@@ -46,10 +47,16 @@ export default function InputForgotPassword({
           text={"Reset Password"}
           colors={"Primary"}
           onPress={() => {
-            if (validateEmail(email)) {
-              firebase.auth().sendPasswordResetEmail(email);
-              nav.navigate("Auth", { screen: "ForgotPasswordDone" });
-            }
+            forgotPassword(email)
+              .then(() =>
+                nav.navigate("Auth", { screen: "ForgotPasswordDone" })
+              )
+              .catch((e) =>
+                Alert.alert(
+                  "Email tidak ditemukan",
+                  "Silahkan masukkan email yang terdaftar"
+                )
+              );
           }}
         />
       </View>
diff --git a/src/screens/auth/RegisterScreen.tsx b/src/screens/auth/RegisterScreen.tsx
index 7679c3a4ae90f115240f879a1168c310424ec6f9..a81d1e2b8278b7be0dff136cfc062d7671149f85 100644
--- a/src/screens/auth/RegisterScreen.tsx
+++ b/src/screens/auth/RegisterScreen.tsx
@@ -54,87 +54,85 @@ const RegisterScreen = ({ navigation }: RootTabScreenProps<"TabOne">) => {
   };
 
   return (
-    <View style={styles.container}>
-      <ScrollView>
-        <View>
-          <Text style={styles.titleText}>Selamat Datang!</Text>
-        </View>
-        <Spacer variant={"xl"} />
-        <View style={styles.componentWrapper}>
-          <MainButton
-            text="Daftar Menggunakan Google"
-            colors="secondary"
-            onPress={() => nav.navigate("Auth", { screen: "RegisterGoogle" })}
-          />
-        </View>
-        <Spacer variant={"l"} />
-        <View style={styles.componentWrapper}>
-          <MainButton
-            text="Daftar Menggunakan Facebook"
-            colors="secondary"
-            onPress={() => nav.navigate("Auth", { screen: "RegisterGoogle" })}
-          />
-        </View>
-        <Spacer variant={"xl"} />
-        <View>
-          <Text style={styles.description}>
-            Silakan isi formulir berikut untuk membuat akun Click
-          </Text>
-        </View>
-        <Spacer variant={"xl"} />
-        <View style={styles.componentWrapper}>
-          <PlainForm
-            formTitle={"Nama Depan"}
-            text={firstName}
-            setText={setFirstName}
-            placeholder={"Masukkan Nama Depan"}
-            errorMessage={"Tolong masukkan nama depan"}
-          />
-        </View>
-        <Spacer variant={"l"} />
-        <View style={styles.componentWrapper}>
-          <PlainForm
-            formTitle={"Nama Belakang"}
-            text={lastName}
-            setText={setLastName}
-            placeholder={"Masukkan Nama Belakang"}
-            errorMessage={"Tolong masukkan nama belakang"}
-          />
-        </View>
-        <Spacer variant={"l"} />
-        <View style={styles.componentWrapper}>
-          <PlainForm
-            formTitle={"Email"}
-            text={email}
-            setText={setEmail}
-            placeholder={"Masukkan Email"}
-            email
-            errorMessage={"Tolong masukkan email yang benar"}
-          />
-        </View>
-        <Spacer variant={"l"} />
-        <View style={styles.componentWrapper}>
-          <IconForm
-            formTitle={"Password"}
-            text={password}
-            setText={setPassword}
-            placeholder={"Masukkan Password"}
-            password
-            errorMessage={"Tolong masukkan password"}
-          />
-        </View>
-        <Spacer variant={"l"} />
-        <View style={styles.componentWrapper}>
-          <PlainForm
-            formTitle={"No. Handphone"}
-            text={phoneNo}
-            setText={setPhoneNo}
-            placeholder={"Masukkan No. Handphone"}
-            phone
-            errorMessage={"Tolong masukkan no. handphone"}
-          />
-        </View>
-      </ScrollView>
+    <ScrollView style={styles.container}>
+      <View>
+        <Text style={styles.titleText}>Selamat Datang!</Text>
+      </View>
+      <Spacer variant={"xl"} />
+      <View style={styles.componentWrapper}>
+        <MainButton
+          text="Daftar Menggunakan Google"
+          colors="secondary"
+          onPress={() => nav.navigate("Auth", { screen: "RegisterGoogle" })}
+        />
+      </View>
+      <Spacer variant={"l"} />
+      <View style={styles.componentWrapper}>
+        <MainButton
+          text="Daftar Menggunakan Facebook"
+          colors="secondary"
+          onPress={() => nav.navigate("Auth", { screen: "RegisterGoogle" })}
+        />
+      </View>
+      <Spacer variant={"xl"} />
+      <View>
+        <Text style={styles.description}>
+          Silakan isi formulir berikut untuk membuat akun Click
+        </Text>
+      </View>
+      <Spacer variant={"xl"} />
+      <View style={styles.componentWrapper}>
+        <PlainForm
+          formTitle={"Nama Depan"}
+          text={firstName}
+          setText={setFirstName}
+          placeholder={"Masukkan Nama Depan"}
+          errorMessage={"Tolong masukkan nama depan"}
+        />
+      </View>
+      <Spacer variant={"l"} />
+      <View style={styles.componentWrapper}>
+        <PlainForm
+          formTitle={"Nama Belakang"}
+          text={lastName}
+          setText={setLastName}
+          placeholder={"Masukkan Nama Belakang"}
+          errorMessage={"Tolong masukkan nama belakang"}
+        />
+      </View>
+      <Spacer variant={"l"} />
+      <View style={styles.componentWrapper}>
+        <PlainForm
+          formTitle={"Email"}
+          text={email}
+          setText={setEmail}
+          placeholder={"Masukkan Email"}
+          email
+          errorMessage={"Tolong masukkan email yang benar"}
+        />
+      </View>
+      <Spacer variant={"l"} />
+      <View style={styles.componentWrapper}>
+        <IconForm
+          formTitle={"Password"}
+          text={password}
+          setText={setPassword}
+          placeholder={"Masukkan Password"}
+          password
+          errorMessage={"Tolong masukkan password"}
+        />
+      </View>
+      <Spacer variant={"l"} />
+      <View style={styles.componentWrapper}>
+        <PlainForm
+          formTitle={"No. Handphone"}
+          text={phoneNo}
+          setText={setPhoneNo}
+          placeholder={"Masukkan No. Handphone"}
+          phone
+          errorMessage={"Tolong masukkan no. handphone"}
+        />
+      </View>
       <Spacer variant={"l"} />
       <View style={styles.titleContainer} testID="TitleContainer">
         <Text style={styles.formTitle} testID="Title">
@@ -161,18 +159,15 @@ const RegisterScreen = ({ navigation }: RootTabScreenProps<"TabOne">) => {
       <View style={styles.componentWrapper}>
         <MainButton text="Daftar" colors="primary" onPress={handleSubmit} />
       </View>
-      <Spacer variant={"xl"} />
-    </View>
+      <Spacer variant="xl" />
+    </ScrollView>
   );
 };
 
 const styles = StyleSheet.create({
   container: {
-    flex: 1,
-    fontStyle: "normal",
-    display: "flex",
+    padding: 24,
     backgroundColor: Colors.background,
-    paddingHorizontal: 24,
   },
   titleText: {
     fontSize: 32,
diff --git a/src/service/firebase/auth.ts b/src/service/firebase/auth.ts
index 0dca517124a071ddb5735ba937694bc98f97307b..417b8abdced9a0860444a43c4b22d89e8940cf05 100644
--- a/src/service/firebase/auth.ts
+++ b/src/service/firebase/auth.ts
@@ -35,3 +35,7 @@ export const changePassword = async (password: string) => {
 export const signUpAuth = async (email: string, password: string) => {
   return await firebase.auth().createUserWithEmailAndPassword(email, password);
 };
+
+export const forgotPassword = async (email: string) => {
+  return await firebase.auth().sendPasswordResetEmail(email);
+};