fixes #4088 better handling in case the user changes his password