Fix #489 and also make the rememberMe checkbox actually remember