diff --git a/app/src/main/java/com/BugBazaar/controller/UserAuthSave.java b/app/src/main/java/com/BugBazaar/controller/UserAuthSave.java
index af044f8..2f2642e 100644
--- a/app/src/main/java/com/BugBazaar/controller/UserAuthSave.java
+++ b/app/src/main/java/com/BugBazaar/controller/UserAuthSave.java
@@ -12,6 +12,9 @@ public class UserAuthSave {
     private static final String KEY_USERNAME = "username";
     private static final String KEY_PASSWORD = "password";
     private static final String keypasscode = "passcode";
+    private static final String USER_DATA = "userCred";
+    private static SharedPreferences sharedPreferences1;
+
     private static final String keypasscode_flag = "passcode_flag";
     private static final String USER_DATA = "userCred";
 
@@ -19,7 +22,7 @@ public class UserAuthSave {
     private SessionManager sessionManager;  // Move the initialization to a constructor
     private static SharedPreferences sharedPreferences1;
 
-    public UserAuthSave(Context context) {
+ public UserAuthSave(Context context) {
         sharedPreferences = context.getSharedPreferences(USER_PREFERENCES, Context.MODE_PRIVATE);
         sessionManager = new SessionManager(context);  // Initialize SessionManager in the constructor
         sharedPreferences1 = context.getSharedPreferences(USER_DATA, Context.MODE_PRIVATE);
diff --git a/app/src/main/java/com/BugBazaar/ui/Signin.java b/app/src/main/java/com/BugBazaar/ui/Signin.java
index 7f703ca..500114f 100644
--- a/app/src/main/java/com/BugBazaar/ui/Signin.java
+++ b/app/src/main/java/com/BugBazaar/ui/Signin.java
@@ -84,7 +84,10 @@ public void onClick(View v) {
                 boolean isLoggedin= loginController.validateLogin(username, password);
 
                 if (isLoggedin==true) {
-
+                    String randomToken = TokenGenerator.generateRandomToken(64);
+                    sessionManager.setLoggedIn(true);
+                    userAuthSave.saveUserData( randomToken,isLoggedin);
+                    userAuthSave.saveuserCred(username,password);
                     sessionManager.setLoggedIn(true);
                     String randomToken = TokenGenerator.generateRandomToken(64);
                     userAuthSave.saveUserData( randomToken,isLoggedin);
diff --git a/app/src/main/java/com/BugBazaar/ui/TermsAndConditionsActivity.java b/app/src/main/java/com/BugBazaar/ui/TermsAndConditionsActivity.java
index b9a8e41..7f5d691 100644
--- a/app/src/main/java/com/BugBazaar/ui/TermsAndConditionsActivity.java
+++ b/app/src/main/java/com/BugBazaar/ui/TermsAndConditionsActivity.java
@@ -21,6 +21,7 @@
 
 public class TermsAndConditionsActivity extends AppCompatActivity {
     WebView webView;
+    private SessionManager sessionManager;
 
     private String webViewUrl;
 
@@ -77,7 +78,7 @@ else if (webViewUrl.endsWith(".bugbazaar.com")){
     }
 
     private String getsessionid() {
-        return String.valueOf(UUID.randomUUID());
+        return sessionManager.getUserToken();
     }
 
     private class JavaScriptInterface {