diff --git a/GMERemittance/Module/Main/User Interface/Wireframe/MainWireframe.swift b/GMERemittance/Module/Main/User Interface/Wireframe/MainWireframe.swift
index 816896bd..1bbe606b 100644
--- a/GMERemittance/Module/Main/User Interface/Wireframe/MainWireframe.swift	
+++ b/GMERemittance/Module/Main/User Interface/Wireframe/MainWireframe.swift	
@@ -61,6 +61,26 @@ extension MainWireframe: MainWireframeInput {
     
     static func logout() {
         guard let window = MainWireframe.shared?.window else {return}
+        let store = UserDefaults.standard
+        store.set(false, forKey: "com.gmeremit.loginStatus")
+        store.removeObject(forKey: "com.gmeremit.dpUrl")
+        store.removeObject(forKey: "com.gmeremit.walletNumber")
+        store.removeObject(forKey: "com.gmeremit.bankName")
+        store.removeObject(forKey: "com.gmeremit.fullName")
+        store.removeObject(forKey: "com.gmeremit.username")
+        store.removeObject(forKey: "com.gmeremit.nickName")
+        store.removeObject(forKey: "com.gmeremit.balance")
+        store.removeObject(forKey: "com.gmeremit.rewardPoint")
+        store.removeObject(forKey: "com.gmeremit.isVerified")
+        store.removeObject(forKey: "com.gmeremit.isKYCSubmitted")
+        store.removeObject(forKey: "com.gmeremit.email")
+        store.removeObject(forKey: "com.gmeremit.mobileNumber")
+        store.removeObject(forKey: "com.gmeremit.password")
+        store.removeObject(forKey: " com.gmeremit.isReferred")
+        store.removeObject(forKey: UserKeys.yearlyLimit)
+        store.removeObject(forKey: UserKeys.availableBalance)
+        store.removeObject(forKey: UserKeys.availableBalance)
+        store.setValue(nil, forKey: UserKeys.accessCode)
         let splaseWireframe = SplashScreenWireframe()
         let nav = UINavigationController.init(rootViewController: splaseWireframe.getMainView())
         window.rootViewController = nav
diff --git a/GMERemittance/SideMenu/SideMenuViewController.swift b/GMERemittance/SideMenu/SideMenuViewController.swift
index a1be2c4f..2c6f4b1a 100644
--- a/GMERemittance/SideMenu/SideMenuViewController.swift
+++ b/GMERemittance/SideMenu/SideMenuViewController.swift
@@ -44,6 +44,11 @@ class SideMenuViewController: UIViewController {
 //        setupBlueBackGroundTheme()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.setUpSettingsScreen()
+    }
+    
     private func setup() {
         self.view.backgroundColor = AppConstants.themeRedColor
         self.roundedBgView.layer.cornerRadius = 20
@@ -108,33 +113,9 @@ class SideMenuViewController: UIViewController {
         let yesAction = UIAlertAction(title: "Yes", style: .default,handler: {
             (action : UIAlertAction!) -> Void in
             
-            RestApiMananger.sharedInstance.cancelExistingNetworkCalls()
-            UserDefaults.standard.removePersistentDomain(forName: Bundle.main.bundleIdentifier!)
-            UserDefaults.standard.synchronize()
-            let appDelegate = UIApplication.shared.delegate as! AppDelegate
-            appDelegate.firstTranscationStatusForHome = true
-            appDelegate.firstTranscationStatusForProfileForm = true
-            
-            
-            UserDefaults.standard.set(false, forKey: "com.gmeremit.loginStatus")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.dpUrl")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.walletNumber")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.bankName")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.fullName")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.username")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.nickName")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.balance")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.rewardPoint")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.isVerified")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.isKYCSubmitted")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.email")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.mobileNumber")
-            UserDefaults.standard.removeObject(forKey: "com.gmeremit.password")
-            UserDefaults.standard.removeObject(forKey: " com.gmeremit.isReferred")
-            UserDefaults.standard.removeObject(forKey: UserKeys.yearlyLimit)
-            UserDefaults.standard.removeObject(forKey: UserKeys.availableBalance)
-            UserDefaults.standard.removeObject(forKey: UserKeys.availableBalance)
-            UserDefaults.standard.setValue(nil, forKey: UserKeys.accessCode)
+//            let appDelegate = UIApplication.shared.delegate as! AppDelegate
+//            appDelegate.firstTranscationStatusForHome = true
+//            appDelegate.firstTranscationStatusForProfileForm = true
              MainWireframe.logout() 
         })