Handling lost users

Can you fix that point so we merge this for 4.5