Small changes, fix remember me