diff --git a/lib/widgets/auth/login_form.dart b/lib/widgets/auth/login_form.dart
index 2d2d2bfd..17b5520d 100644
--- a/lib/widgets/auth/login_form.dart
+++ b/lib/widgets/auth/login_form.dart
@@ -37,8 +37,8 @@ class _LoginFormState extends State<LoginForm> {
   String uniqueId = "Unknown";
   var projectsList = [];
   bool _isInit = true;
-  FocusNode focusPass;
-  FocusNode focusProject;
+  FocusNode focusPass = FocusNode();
+  FocusNode focusProject = FocusNode();
 
   var userInfo = UserModel(
       UserID: '',
@@ -72,8 +72,7 @@ class _LoginFormState extends State<LoginForm> {
 
   @override
   Widget build(BuildContext context) {
-    final focusPass = FocusNode();
-    final focusProject = FocusNode();
+
 
     AuthProvider authProv = Provider.of<AuthProvider>(context);
 
@@ -100,7 +99,7 @@ class _LoginFormState extends State<LoginForm> {
                 userInfo.UserID = value.trim();
               },
               onFieldSubmitted: (_) {
-                FocusScope.of(context).nextFocus();
+                focusPass.nextFocus();
               },
               autofocus: false,
             ),
@@ -121,7 +120,7 @@ class _LoginFormState extends State<LoginForm> {
                 userInfo.Password = value;
               },
               onFieldSubmitted: (_) {
-                FocusScope.of(context).nextFocus();
+                focusPass.nextFocus();
                 helpers.showCupertinoPicker(
                     context, projectsList, 'Name', onSelectProject);
               },