diff --git a/lib/backend/DataManager.dart b/lib/backend/DataManager.dart
index 6576e25..6cddfa2 100644
--- a/lib/backend/DataManager.dart
+++ b/lib/backend/DataManager.dart
@@ -90,7 +90,8 @@ class _DataManager{
 
       Debug.LogResponse(response.body.toString());
       joinedServices = jsonDecode(response.body.toString());
-      Debug.LogResponse(services);
+      Debug.LogResponse(services,src:"services");
+      Debug.LogResponse(joinedServices, src:"joined services");
     }catch(e){
       Debug.LogError(e);
     }
@@ -112,6 +113,8 @@ class _DataManager{
         }
       }
 
+      Debug.LogResponse(JoinedServices, src: "Joined ser");
+
       if(!joined){
         AvailableServices.add(service);
       }
diff --git a/lib/login.dart b/lib/login.dart
index 7f69b1e..0f36aba 100644
--- a/lib/login.dart
+++ b/lib/login.dart
@@ -21,8 +21,8 @@ class _LoginPageState extends State<LoginPage> {
   void initState() {
     // TODO: implement initState
     super.initState();
-    // Reset();
-    AutoLogin();
+    Reset();
+    // AutoLogin();
   }
 
   void Reset() async{
@@ -81,8 +81,11 @@ class _LoginPageState extends State<LoginPage> {
                       mainAxisSize: MainAxisSize.min,
                       children: [
                         // Text("Login"),
-                        ListTile(title: Text("Enter your Phone Number"),
+                        ListTile(title: Text("Phone Number"),
                           subtitle: TextField(controller: usernameController,decoration: InputDecoration(hintText: "ex: 0701234567"),),),
+
+                        ListTile(title: Text("Pay Number"),
+                          subtitle: TextField(controller: passwordController,decoration: InputDecoration(hintText: "ex: 0701234567"),),),
                         SizedBox(height: 30,),
 
                         ElevatedButton(autofocus: true,onPressed: () async{
@@ -101,10 +104,15 @@ class _LoginPageState extends State<LoginPage> {
                             return;
                           }
 
+                          if(passwordController.text.length < 6){
+                            Dialogs.showAlertDialog(context, "Invalid Pay Number", "Pay Number length is invalid");
+                            return;
+                          }
+
                           setState(() {
                             isLogging=true;
                           });
-                          String results = await DataManager.instance().Login(usernameController.text, usernameController.text);
+                          String results = await DataManager.instance().Login(usernameController.text, passwordController.text);
                           if(results == "0"){
                             Navigator.of(context).pushReplacement(MaterialPageRoute(builder: (context)=>HomePage()));
                           }else{
diff --git a/pubspec.lock b/pubspec.lock
index 54f2a3f..9f7ff04 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -128,14 +128,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.18.1"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
   lints:
     dependency: transitive
     description:
@@ -148,18 +140,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
@@ -281,10 +273,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -321,10 +313,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description:
@@ -341,6 +333,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
   win32:
     dependency: transitive
     description:
@@ -358,5 +358,5 @@ packages:
     source: hosted
     version: "1.0.1"
 sdks:
-  dart: ">=3.0.6 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=3.3.0"
diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp
index b25e363..955ee30 100644
--- a/windows/runner/flutter_window.cpp
+++ b/windows/runner/flutter_window.cpp
@@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() {
     this->Show();
   });
 
+  // Flutter can complete the first frame before the "show window" callback is
+  // registered. The following call ensures a frame is pending to ensure the
+  // window is shown. It is a no-op if the first frame hasn't completed yet.
+  flutter_controller_->ForceRedraw();
+
   return true;
 }