diff --git a/GMERemittance/Module/Login/Application Logic/Interactor/LoginInteractor.swift b/GMERemittance/Module/Login/Application Logic/Interactor/LoginInteractor.swift
index 4d4b6179..b602a7c5 100644
--- a/GMERemittance/Module/Login/Application Logic/Interactor/LoginInteractor.swift	
+++ b/GMERemittance/Module/Login/Application Logic/Interactor/LoginInteractor.swift	
@@ -34,6 +34,16 @@ class LoginInteractor {
         
         return data.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0))
     }
+    
+    private func isValid(userName: String, password: String) -> (isValid: Bool, error: Error){
+        var error = ""
+        var isValid = true
+        if userName.isEmpty {
+            error = error + "Username field is required."; isValid = false}
+        if password.isEmpty {error = error + "\n Password filed is required."; isValid = false}
+        let _error = NSError.init(domain: "LoginInteractor", code: 0, userInfo: [NSLocalizedDescriptionKey : error])
+        return (isValid, _error)
+    }
 
     // MARK: Converting entities
 }
@@ -42,6 +52,12 @@ class LoginInteractor {
 
 extension LoginInteractor: LoginInteractorInput {
     func login(username: String, password: String) {
+        
+        let validationResult = self.isValid(userName: username, password: password)
+        if !validationResult.isValid {
+            self.output?.show(error: validationResult.error)
+            return
+        }
         guard let passwordBase64Data = self.toBase64(text: password) else {
             return
             
diff --git a/GMERemittance/RestApiManager.swift b/GMERemittance/RestApiManager.swift
index b8a57fe9..8146cf7f 100644
--- a/GMERemittance/RestApiManager.swift
+++ b/GMERemittance/RestApiManager.swift
@@ -93,8 +93,6 @@ class RestApiMananger {
     
     //Signing up a new user
     func registerUser(userId: String, password: String, completion: @escaping (ApiResult) -> Void) {
-
-        
         manager.request(
             URL(string: UrlManager.sharedInstance.getSignupURL())!,
             method: .post,