Some fixes with "Remember me" function