diff --git a/src/localization/LocalizationStrings.js b/src/localization/LocalizationStrings.js
index 25056cc..12c5cab 100644
--- a/src/localization/LocalizationStrings.js
+++ b/src/localization/LocalizationStrings.js
@@ -14,11 +14,15 @@ export const strings = new LocalizedStrings({
       token: 'Credentials no longer valid, please sign-in again.',
       internal: 'Internal error.',
       unknown: 'Unknown error.',
+      emptyFields: 'Please fill in all fields',
+      samePassword: 'Password is the same as old password.',
+      mismatchPassword: 'Password mismatch.',
     },
     placeholders: {
       username: 'Username',
       password: 'Password',
       newPassword: 'New Password',
+      confirmPassword: 'Confirm Password',
       email: 'Email',
     },
     buttons: {
@@ -27,8 +31,10 @@ export const strings = new LocalizedStrings({
       signOut: 'Sign Out',
       sendEmail: 'Send Email',
       submit: 'Submit',
+      cancel: 'Cancel',
     },
     messages: {
+      message: 'Message',
       resetEmail:
         "You should soon receive an email containing the instructions to reset your password. Please make sure to check your spam if you can't find the email.",
     },
diff --git a/src/screens/ForgotPassword.js b/src/screens/ForgotPassword.js
index 1994cfc..8333c2c 100644
--- a/src/screens/ForgotPassword.js
+++ b/src/screens/ForgotPassword.js
@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 import {pageStyle, pageItemStyle} from '../AppStyle';
-import {View, Text, TextInput, Button} from 'react-native';
+import { View, Text, TextInput, Button, ActivityIndicator, Alert } from "react-native";
 import {strings} from '../localization/LocalizationStrings';
 import {authenticationApi, handleApiError} from '../api/apiHandler';
 import {useStore} from '../Store';
@@ -8,7 +8,7 @@ import {useStore} from '../Store';
 export default class ForgotPassword extends Component {
   state = {
     email: '',
-    sent: false,
+    loading: false,
   };
 
   render() {
@@ -28,13 +28,20 @@ export default class ForgotPassword extends Component {
             textContentType="emailAddress"
             returnKeyType="go"
             onChangeText={text => this.setState({email: text})}
-            onSubmitEditing={this.onSubmit}
+            onSubmitEditing={() => {this.state.email && this.onSubmit}}
           />
-          <Text>{this.state.sent && strings.messages.resetEmail}</Text>
         </View>
+        <View style={pageItemStyle.container}>
+          <ActivityIndicator size="large" animating={this.state.loading} />
+        </View>
+        {this.state.loading ||
         <View style={pageItemStyle.containerButton}>
-          <Button title={strings.buttons.sendEmail} onPress={this.onSubmit} />
+          <Button title={strings.buttons.sendEmail}
+                  onPress={this.onSubmit}
+                  disabled={!this.state.email}
+          />
         </View>
+        }
         <View style={pageItemStyle.containerButton}>
           <Button title={strings.buttons.signIn} onPress={this.backToSignin} />
         </View>
@@ -43,6 +50,7 @@ export default class ForgotPassword extends Component {
   }
 
   onSubmit = async () => {
+    this.setState({loading: true});
     try {
       useStore.getState().clearSession();
 
@@ -53,11 +61,12 @@ export default class ForgotPassword extends Component {
         undefined,
         true,
       );
-      console.log(JSON.stringify(response, null, '\t'));
-      this.setState({sent: true});
+      // console.log(JSON.stringify(response.data, null, '\t'));
+      Alert.alert(strings.messages.message, strings.messages.resetEmail);
     } catch (error) {
       handleApiError(strings.errors.forgotPasswordTitle, error);
     }
+    this.setState({loading: false});
   };
 
   backToSignin = () => {