diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart
index a3560147..8d61a660 100644
--- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart
+++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart
@@ -38,6 +38,7 @@ class _MihloadingcircleState extends State<Mihloadingcircle> {
   void initState() {
     //_controller.animateTo(26);
     super.initState();
+    checkScreenSize();
   }
 
   @override
@@ -48,7 +49,6 @@ class _MihloadingcircleState extends State<Mihloadingcircle> {
 
   @override
   Widget build(BuildContext context) {
-    checkScreenSize();
     return Dialog(
       child: Container(
           padding: EdgeInsets.all(popUpPaddingSize),
diff --git a/Frontend/lib/mih_env/env.dart b/Frontend/lib/mih_env/env.dart
index f86f1312..c96e44e0 100644
--- a/Frontend/lib/mih_env/env.dart
+++ b/Frontend/lib/mih_env/env.dart
@@ -15,13 +15,13 @@ abstract class AppEnviroment {
       case Enviroment.dev:
         {
           //================= Android Dev Urls =================
-          // baseApiUrl = "http://10.0.2.2:8080";
-          // baseFileUrl = "http://10.0.2.2:9000";
-          // baseAiUrl = "http://10.0.2.2:11434";
+          baseApiUrl = "http://10.0.2.2:8080";
+          baseFileUrl = "http://10.0.2.2:9000";
+          baseAiUrl = "http://10.0.2.2:11434";
           //================= Web Dev Urls =================
-          baseApiUrl = "http://localhost:8080";
-          baseFileUrl = "http://localhost:9000";
-          baseAiUrl = "http://localhost:11434";
+          // baseApiUrl = "http://localhost:8080";
+          // baseFileUrl = "http://localhost:9000";
+          // baseAiUrl = "http://localhost:11434";
           whatsappAccessToken =
               "EAAPINXuNFdYBOzBjTcvZA2iPXEHbHRF9uNXyP3ihkPRUcBqKNru5g9NKRRKkFaiaITEzO3BMo6CjdUmlDH4qYTW2mzDrZB4Q21ZCEZBgECZCu27vfaOXJZCYQLNxwoXkrZBRYv8ZAP37f69r3z9JxLQxdxn9gwqA3oNZAlBBRapJQzxOr6pZBTdI3bbjbu17ZBIwRcF4JCqPDCNLEZCI3bmHwEd2i2niNMYZD";
           //fingerPrintPluginKey = 'h5X7a5j14iUZCobI1ZeX';
diff --git a/Frontend/lib/mih_packages/authentication/register.dart b/Frontend/lib/mih_packages/authentication/register.dart
index cab1ddec..ed038fdd 100644
--- a/Frontend/lib/mih_packages/authentication/register.dart
+++ b/Frontend/lib/mih_packages/authentication/register.dart
@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import '../../main.dart';
@@ -53,8 +54,15 @@ class _RegisterState extends State<Register> {
       }),
     );
     if (response.statusCode == 201) {
-      Navigator.of(context).pushNamedAndRemoveUntil('/', (route) => false);
-      signUpSuccess();
+      Navigator.of(context).pushNamedAndRemoveUntil(
+        '/',
+        (route) => false,
+        arguments: AuthArguments(
+          true,
+          true,
+        ),
+      );
+      // signUpSuccess();
       // setState(() {
       //   successfulSignUp = true;
       // });
diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart
index 84093f3f..9eaecdb7 100644
--- a/Frontend/lib/mih_packages/authentication/signin.dart
+++ b/Frontend/lib/mih_packages/authentication/signin.dart
@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import '../../main.dart';
@@ -186,7 +187,14 @@ class _SignInState extends State<SignIn> {
       await signUserIn();
       if (successfulSignIn) {
         // TextInput.finishAutofillContext();
-        Navigator.of(context).pushNamedAndRemoveUntil('/', (route) => false);
+        Navigator.of(context).pushNamedAndRemoveUntil(
+          '/',
+          (route) => false,
+          arguments: AuthArguments(
+            true,
+            true,
+          ),
+        );
       }
     }
   }