diff --git a/components/Login/component.tsx b/components/Login/component.tsx
index 12c98034..cba3b632 100644
--- a/components/Login/component.tsx
+++ b/components/Login/component.tsx
@@ -22,12 +22,12 @@ export default function Login(): React.JSX.Element {
     return (
         <Stack.Navigator screenOptions={{ headerShown: false }}>
             {
-                (_.isUndefined(storedServer) || changeServer) ? (
+                (changeServer) ? (
                     <Stack.Screen
                         name="ServerAddress"
                         options={{
                             headerShown: false,     
-                            animationTypeForReplace: triggerAuth ? 'push' : 'pop'    
+                            animationTypeForReplace: triggerAuth || changeServer ? 'push' : 'pop'    
                         }}
                         component={ServerAddress}
                         />
@@ -38,7 +38,7 @@ export default function Login(): React.JSX.Element {
                             name="ServerAuthentication" 
                             options={{ 
                                 headerShown: false, 
-                                animationTypeForReplace: 'push'
+                                animationTypeForReplace: changeUsername ? 'pop' : 'push'
                             }} 
                             component={ServerAuthentication} 
                         />
diff --git a/components/Login/provider.tsx b/components/Login/provider.tsx
index 1213f6a5..49d593b5 100644
--- a/components/Login/provider.tsx
+++ b/components/Login/provider.tsx
@@ -67,6 +67,8 @@ const JellyfinAuthenticationContextInitializer = () => {
 
         if (changeServer)
             mutateServer();
+        else 
+            refetchServer();
     }, [
         changeUsername,
         changeServer