diff --git a/lib/pages/loginForm.dart b/lib/pages/loginForm.dart
index da44beb..ed0e28d 100644
--- a/lib/pages/loginForm.dart
+++ b/lib/pages/loginForm.dart
@@ -297,7 +297,7 @@ class LoginFormState extends State<LoginForm> {
     if (srv.loggedIn()) {
 
        setState(() => _isLoading = false);
-
+       
        if (await srvrRequest.isExtensionInstalled(_currentServer, "twilio")) {
           _currentServer.twilioInstalled = true;
        }
@@ -317,6 +317,7 @@ class LoginFormState extends State<LoginForm> {
         if (_currentServer.installationid.isEmpty) {
           _showSnackBar("Couldn't find this app's extension at the given url");
         }
+      
 
       } catch (e) {
         _showSnackBar("Couldn't communicate with the extension on the server.");
@@ -336,6 +337,7 @@ class LoginFormState extends State<LoginForm> {
             _currentServer.departments_ids = user['departments_ids'];
           });
         }
+        
 
        dbHelper.upsertServer(
           _currentServer, "id=?", [_currentServer.id]).then((srvv) {
@@ -354,8 +356,10 @@ class LoginFormState extends State<LoginForm> {
             ), (Route<dynamic> route) => false);
 
       });
-    } else
+    } else{
+       setState(() => _isLoading = false);
       _showSnackBar("Login was not successful");
+    }
   }
 
   void _showSnackBar(String text) {
diff --git a/lib/pages/servers_manage.dart b/lib/pages/servers_manage.dart
index 3368f5e..08fa7db 100644
--- a/lib/pages/servers_manage.dart
+++ b/lib/pages/servers_manage.dart
@@ -7,7 +7,7 @@ import 'package:livehelp/data/database.dart';
 import 'package:livehelp/model/server.dart';
 import 'package:livehelp/pages/loginForm.dart';
 import 'package:livehelp/pages/main_page.dart';
-import 'package:livehelp/utils/routes.dart';
+import 'package:livehelp/utils/routes.dart' as LHCRouter;
 import 'package:livehelp/utils/server_requests.dart';
 import 'package:livehelp/pages/token_inherited_widget.dart';
 import 'package:livehelp/widget/server_item_widget.dart';
@@ -126,8 +126,8 @@ class ServersManageState extends State<ServersManage> {
                   else {
                   Navigator.of(context).pop();
                    Navigator.of(context).pushReplacement(
-                     Router.generateRoute(new RouteSettings(
-                       name: AppRoutes.main, arguments:new RouteArguments(_fcmToken)
+                     LHCRouter.Router.generateRoute(new RouteSettings(
+                       name: LHCRouter.AppRoutes.main, arguments:new LHCRouter.RouteArguments(_fcmToken)
                      )
                      )
                     );
@@ -155,10 +155,10 @@ class ServersManageState extends State<ServersManage> {
 
     void _addServer({Server svr}) {
     //Navigator.of(context).pop();
-    Navigator.of(context).push(FadeRoute(
+    Navigator.of(context).push(LHCRouter.FadeRoute(
       builder: (BuildContext context) => new TokenInheritedWidget(
           token: _fcmToken, child:  LoginForm(isNew: true, server: svr,)),
-      settings: new RouteSettings(name: AppRoutes.login,),
+      settings: new RouteSettings(name: LHCRouter.AppRoutes.login,),
     ));
   }