diff --git a/frontend/.env b/frontend/.env
index 43e865f..cdd5e6d 100644
--- a/frontend/.env
+++ b/frontend/.env
@@ -1,2 +1,2 @@
-API_BASE_URL=https://musiq-sc2d.onrender.com/api
+API_BASE_URL=http://localhost:3000/api
 NEXT_PUBLIC_GOOGLE_CLIENT_ID=1089487912826-lsje4lu9ned4m6s8lv9rhv03mncu9e0a.apps.googleusercontent.com
diff --git a/frontend/MusicApp/Models/AuthToken.swift b/frontend/MusicApp/Models/AuthToken.swift
index 686a046..aa18240 100644
--- a/frontend/MusicApp/Models/AuthToken.swift
+++ b/frontend/MusicApp/Models/AuthToken.swift
@@ -22,6 +22,7 @@ struct LoginRequest: Codable {
 struct SignupRequest: Codable {
     let username: String
     let password: String
+    let confirmPassword: String
 }
 
 struct RefreshTokenRequest: Codable {
diff --git a/frontend/MusicApp/Services/APIService.swift b/frontend/MusicApp/Services/APIService.swift
index 05b11ee..cfd9e48 100644
--- a/frontend/MusicApp/Services/APIService.swift
+++ b/frontend/MusicApp/Services/APIService.swift
@@ -7,7 +7,7 @@ class APIService {
     private let session: URLSession
     
     init(baseURL: String? = nil) {
-        self.baseURL = baseURL ?? ProcessInfo.processInfo.environment["API_BASE_URL"] ?? "https://musiq-api.onrender.com/api"
+        self.baseURL = baseURL ?? ProcessInfo.processInfo.environment["API_BASE_URL"] ?? "http://localhost:3000/api"
         
         let configuration = URLSessionConfiguration.default
         configuration.timeoutIntervalForRequest = 30
diff --git a/frontend/MusicApp/Services/AuthService.swift b/frontend/MusicApp/Services/AuthService.swift
index 578cf02..4d54585 100644
--- a/frontend/MusicApp/Services/AuthService.swift
+++ b/frontend/MusicApp/Services/AuthService.swift
@@ -14,7 +14,6 @@ class AuthService {
             
             guard response.success, let data = response.data else {
                 if let error = response.error {
-                    print("Login Error: \(error.code) - \(error.message)")
                     throw NetworkError.unknown(NSError(domain: "AuthService", code: Int(error.code) ?? 401, userInfo: [NSLocalizedDescriptionKey: error.message]))
                 }
                 throw NetworkError.unauthorized
@@ -24,7 +23,6 @@ class AuthService {
         } catch let error as NetworkError {
             throw error
         } catch {
-            print("Login Unexpected Error: \(error)")
             throw NetworkError.unknown(error)
         }
     }
@@ -40,7 +38,6 @@ class AuthService {
             
             guard response.success, let data = response.data else {
                 if let error = response.error {
-                    print("Signup Error: \(error.code) - \(error.message)")
                     throw NetworkError.unknown(NSError(domain: "AuthService", code: Int(error.code) ?? 400, userInfo: [NSLocalizedDescriptionKey: error.message]))
                 }
                 throw NetworkError.unknown(NSError(domain: "AuthService", code: -1, userInfo: [NSLocalizedDescriptionKey: "Signup failed"]))
@@ -50,7 +47,6 @@ class AuthService {
         } catch let error as NetworkError {
             throw error
         } catch {
-            print("Signup Unexpected Error: \(error)")
             throw NetworkError.unknown(error)
         }
     }
diff --git a/frontend/MusicApp/ViewModels/AuthViewModel.swift b/frontend/MusicApp/ViewModels/AuthViewModel.swift
index 60b24bf..03df026 100644
--- a/frontend/MusicApp/ViewModels/AuthViewModel.swift
+++ b/frontend/MusicApp/ViewModels/AuthViewModel.swift
@@ -60,9 +60,8 @@ class AuthViewModel: ObservableObject {
             let user = try await authService.getCurrentUser()
             isAuthenticated = true
             
-            if let appState = try? await getAppState() {
-                appState.authenticate(user: user)
-            }
+            let appState = getAppState()
+            appState.authenticate(user: user)
         } catch {
             errorMessage = error.localizedDescription
         }
@@ -102,7 +101,7 @@ class AuthViewModel: ObservableObject {
         }
         
         do {
-            let request = SignupRequest(username: username, password: password)
+            let request = SignupRequest(username: username, password: password, confirmPassword: confirmPassword)
             let token = try await authService.signup(request: request)
             
             KeychainHelper.store(token: token.accessToken, forKey: "accessToken")