diff --git a/GME Remit/APIs/UrlManager.swift b/GME Remit/APIs/UrlManager.swift
index 75d4af7b..91ffd520 100644
--- a/GME Remit/APIs/UrlManager.swift	
+++ b/GME Remit/APIs/UrlManager.swift	
@@ -39,7 +39,7 @@ class UrlManager {
     case .ngrok:
       self.baseURL = justinServer
     case .testLive:
-      self.baseURL = "http://livetest.gmeremit.com:8012/api/"
+      self.baseURL = "http://103.139.152.11:5555/api/"
     }
   }
   
@@ -58,7 +58,7 @@ class UrlManager {
     case .ngrok:
       self.baseURL = justinServer
     case .testLive:
-      self.baseURL = "http://livetest.gmeremit.com:8012/api/"
+      self.baseURL = "http://103.139.152.11:5555/api/"
     }
   }
 }
diff --git a/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift b/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift
index b20dfbae..641f56bf 100644
--- a/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift	
+++ b/GME Remit/Modules/Login/User Interface/View/LoginViewController.swift	
@@ -100,7 +100,10 @@ class LoginViewController: UIViewController {
     if self.userNameTextField.text == "" {
       DebugManager.shared.setTestAccount(target: self) { (id, pw) in
         self.userNameTextField.text = id
+        self.passwordTextField.text = pw
         self.encryptedPassword = pw
+        self.userNameTextField.sendActions(for: .editingChanged)
+        self.passwordTextField.sendActions(for: .editingChanged)
       }
     }
     #endif
@@ -134,6 +137,7 @@ class LoginViewController: UIViewController {
     userNameTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
     
     passwordTextField.validCondition = { $0.count > 5 }
+    passwordTextField.isSecureTextEntry = true
     passwordTextField.errorMessage = "password_policy_error".localized()
     passwordTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
     
@@ -188,9 +192,7 @@ class LoginViewController: UIViewController {
       let isUseBiometricAuth = KeyChain.shared.get(key: .biometricAuth),
       email == typedEmail,
       isUseBiometricAuth == "1" else {
-        let secureKeypad = SecureKeypad(target: self)
-        secureKeypad.delegate = self
-        secureKeypad.present(animated: true)
+        self.encryptedPassword = self.passwordTextField.text
         return
     }
     
@@ -216,10 +218,6 @@ extension LoginViewController: LoginViewInterface {
 // MARK: - UITextFieldDelegate
 extension LoginViewController: UITextFieldDelegate {
   func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
-    if textField == passwordTextField {
-      self.authenticate()
-      return false
-    }
     return true
   }
   
@@ -255,15 +253,11 @@ extension LoginViewController: BiometricAuthenticationViewControllerDelegate {
     errorMessage: String?
   ) {
     DispatchQueue.main.async {[weak self] in
-      guard let `self` = self else {return}
+      guard let _ = self else {return}
       
       switch error {
       case .userFallback, .biometryNotAvailable:
-        viewController.dismiss(animated: true) {
-          let secureKeypad = SecureKeypad(target: viewController)
-          secureKeypad.delegate = self
-          secureKeypad.present(animated: true)
-        }
+        viewController.dismiss(animated: true, completion: nil)
         
       case .notBeConfigured, .biometryNotEnrolled:
         viewController.alert(type: .error, message: error.message, title: "Alert") {
@@ -283,16 +277,3 @@ extension LoginViewController: BiometricAuthenticationViewControllerDelegate {
   }
   
 }
-
-// MARK: - SecureKeypadDelegate
-extension LoginViewController: SecureKeypadDelegate {
-  func didComplete(_ encryptedString: String, garbagePassword: String, length: Int) {
-    if encryptedString != "" {
-      
-      self.encryptedPassword = encryptedString
-      self.passwordTextField.text = garbagePassword
-      
-      passwordTextField.sendActions(for: .editingChanged)
-    }
-  }
-}