diff --git a/src/components/Amicale/Login/LoginForm.tsx b/src/components/Amicale/Login/LoginForm.tsx
index 4fbcf60..91bef60 100644
--- a/src/components/Amicale/Login/LoginForm.tsx
+++ b/src/components/Amicale/Login/LoginForm.tsx
@@ -22,7 +22,7 @@ type Props = {
   onResetPasswordPress: () => void;
 };
 
-const ICON_AMICALE = require('../../../assets/amicale.png');
+const ICON_AMICALE = require('../../../../assets/amicale.png');
 
 const styles = StyleSheet.create({
   card: {
diff --git a/src/components/Amicale/LogoutDialog.tsx b/src/components/Amicale/LogoutDialog.tsx
index 8d2759c..e0a6705 100644
--- a/src/components/Amicale/LogoutDialog.tsx
+++ b/src/components/Amicale/LogoutDialog.tsx
@@ -33,6 +33,7 @@ function LogoutDialog(props: PropsType) {
   const onClickAccept = async (): Promise<void> => {
     return new Promise((resolve: () => void) => {
       onLogout();
+      props.onDismiss();
       resolve();
     });
   };
diff --git a/src/components/Amicale/Vote/VoteSelect.tsx b/src/components/Amicale/Vote/VoteSelect.tsx
index fc290c0..82eff99 100644
--- a/src/components/Amicale/Vote/VoteSelect.tsx
+++ b/src/components/Amicale/Vote/VoteSelect.tsx
@@ -128,7 +128,10 @@ function VoteSelect(props: Props) {
         message={i18n.t('screens.vote.select.dialogMessage')}
       />
       <ErrorDialog
-        visible={currentError.status !== REQUEST_STATUS.SUCCESS}
+        visible={
+          currentError.status !== REQUEST_STATUS.SUCCESS ||
+          currentError.code !== undefined
+        }
         onDismiss={onErrorDialogDismiss}
         status={currentError.status}
         code={currentError.code}
diff --git a/src/screens/Amicale/Equipment/EquipmentRentScreen.tsx b/src/screens/Amicale/Equipment/EquipmentRentScreen.tsx
index a145c98..d2f119c 100644
--- a/src/screens/Amicale/Equipment/EquipmentRentScreen.tsx
+++ b/src/screens/Amicale/Equipment/EquipmentRentScreen.tsx
@@ -407,7 +407,10 @@ function EquipmentRentScreen(props: Props) {
         />
 
         <ErrorDialog
-          visible={currentError.status !== REQUEST_STATUS.SUCCESS}
+          visible={
+            currentError.status !== REQUEST_STATUS.SUCCESS ||
+            currentError.code !== undefined
+          }
           onDismiss={onErrorDialogDismiss}
           status={currentError.status}
           code={currentError.code}
diff --git a/src/screens/Amicale/LoginScreen.tsx b/src/screens/Amicale/LoginScreen.tsx
index cfcc7c8..56eca27 100644
--- a/src/screens/Amicale/LoginScreen.tsx
+++ b/src/screens/Amicale/LoginScreen.tsx
@@ -35,11 +35,13 @@ import LoginForm from '../../components/Amicale/Login/LoginForm';
 import { useFocusEffect, useNavigation } from '@react-navigation/native';
 import { TabRoutes } from '../../navigation/TabNavigator';
 import { useShouldShowMascot } from '../../context/preferencesContext';
+import { useLogin } from '../../context/loginContext';
 
 type Props = StackScreenProps<MainStackParamsList, 'login'>;
 
 function LoginScreen(props: Props) {
   const navigation = useNavigation<StackNavigationProp<any>>();
+  const { setLogin } = useLogin();
   const [loading, setLoading] = useState(false);
   const [nextScreen, setNextScreen] = useState<string | undefined>(undefined);
   const [mascotDialogVisible, setMascotDialogVisible] = useState(false);
@@ -88,11 +90,12 @@ function LoginScreen(props: Props) {
    * Navigates to the screen specified in navigation parameters or simply go back tha stack.
    * Saves in user preferences to not show the login banner again.
    */
-  const handleSuccess = () => {
+  const handleSuccess = (token: string) => {
     // Do not show the home login banner again
     if (homeMascot.shouldShow) {
       homeMascot.setShouldShow(false);
     }
+    setLogin(token);
     if (!nextScreen) {
       navigation.goBack();
     } else {
@@ -138,7 +141,10 @@ function LoginScreen(props: Props) {
             emotion={MASCOT_STYLE.NORMAL}
           />
           <ErrorDialog
-            visible={currentError.status !== REQUEST_STATUS.SUCCESS}
+            visible={
+              currentError.status !== REQUEST_STATUS.SUCCESS ||
+              currentError.code !== undefined
+            }
             onDismiss={hideErrorDialog}
             status={currentError.status}
             code={currentError.code}