140615 Merge both autologin and swipe