Unified Changes and fixed remember me