diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index 37c5de6c8..e8c8400e2 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -208,11 +208,7 @@ class MenuDrawer extends StatelessWidget {
             children: <Widget>[
               // Hide options while refreshing data
               state.credentials.token.isEmpty
-                  ? Expanded(
-                      child: LoadingIndicator(
-                        height: 30,
-                      ),
-                    )
+                  ? Expanded(child: SizedBox())
                   : Container(
                       padding:
                           EdgeInsets.symmetric(horizontal: 14, vertical: 3),
diff --git a/lib/ui/settings/settings_list.dart b/lib/ui/settings/settings_list.dart
index 70d883da0..c99f4021e 100644
--- a/lib/ui/settings/settings_list.dart
+++ b/lib/ui/settings/settings_list.dart
@@ -25,6 +25,10 @@ class SettingsList extends StatelessWidget {
     final settingsUIState = state.uiState.settingsUIState;
     final showAll = settingsUIState.entityType == EntityType.company;
 
+    if (state.credentials.token.isEmpty) {
+      return SizedBox();
+    }
+
     if (!state.userCompany.isAdmin)
       return ListView(
         children: <Widget>[
@@ -108,16 +112,16 @@ class SettingsList extends StatelessWidget {
             viewModel: viewModel,
           ),
          */
-        if (showAll)
-          SettingsListTile(
-            section: kSettingsDeviceSettings,
-            viewModel: viewModel,
-          ),
         if (showAll && state.userCompany.isOwner)
           SettingsListTile(
             section: kSettingsAccountManagement,
             viewModel: viewModel,
           ),
+        if (showAll)
+          SettingsListTile(
+            section: kSettingsDeviceSettings,
+            viewModel: viewModel,
+          ),
         Container(
           color: Theme.of(context).bottomAppBarColor,
           padding: const EdgeInsets.only(left: 19, top: 16, bottom: 16),