diff --git a/README.md b/README.md
index bd878c03..905303de 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 [![Build Status](https://img.shields.io/travis/rootstrap/ios-base/master.svg)](https://travis-ci.org/rootstrap/ios-base)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/rootstrap/ios-base.svg)](https://codeclimate.com/github/rootstrap/ios-base)
 [![License](https://img.shields.io/github/license/rootstrap/ios-base.svg)](https://github.com/rootstrap/ios-base/blob/master/LICENSE.md)
 
 # iOS Base Template
diff --git a/ios-base/AppDelegate.swift b/ios-base/AppDelegate.swift
index e4e8eaca..4e8cf5cb 100644
--- a/ios-base/AppDelegate.swift
+++ b/ios-base/AppDelegate.swift
@@ -46,7 +46,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     UserDataManager.deleteUser()
     SessionManager.deleteSession()
     //Clear any local data if needed
-    //Take user to onboarding if needed
+    //Take user to onboarding if needed, do NOT redirect the user if is already in the landing
+    // to avoid losing the current VC stack state.
     if window?.rootViewController is HomeViewController {
       window?.rootViewController = UIStoryboard(name: "Main", bundle: nil).instantiateInitialViewController()
     }