diff --git a/components/Login/helpers/server-authentication.tsx b/components/Login/helpers/server-authentication.tsx
index f09ee4a0..c35c859f 100644
--- a/components/Login/helpers/server-authentication.tsx
+++ b/components/Login/helpers/server-authentication.tsx
@@ -65,7 +65,7 @@ export default function ServerAuthentication(): React.JSX.Element {
                 />
 
             <Button 
-                disabled={_.isEmpty(username) || _.isEmpty(password)}
+                disabled={_.isEmpty(username) || _.isEmpty(password) || useApiMutation.isPending}
                 onPress={() => {
 
                     if (!_.isUndefined(username)) {
diff --git a/components/Login/helpers/server-library.tsx b/components/Login/helpers/server-library.tsx
index ab4acd31..980b2655 100644
--- a/components/Login/helpers/server-library.tsx
+++ b/components/Login/helpers/server-library.tsx
@@ -45,11 +45,9 @@ export default function ServerLibrary(): React.JSX.Element {
         <View marginHorizontal={10} flex={1} justifyContent='center'>
             <Heading>Select Music Library</Heading>
 
-            { isPending && (
+            { isPending ? (
                 <ActivityIndicator />
-            )}
-
-            { libraries &&
+            ) : (
                 <ToggleGroup
                     orientation="vertical"
                     id="librarySelection"
@@ -57,13 +55,13 @@ export default function ServerLibrary(): React.JSX.Element {
                     type="single"
                     disableDeactivation={true}
                 >
-                    { libraries.map((library) => {
+                    { libraries!.map((library) => {
                         <ToggleGroup.Item value={library.Id!} aria-label={library.Name!}>
                             <Label htmlFor={library.Id!} size="$2">{library.Name!}</Label>
                         </ToggleGroup.Item>
                     })}
               </ToggleGroup>
-            }
+            )}
 
             { isError && (
                 <Text>Unable to load libraries</Text>