Changed to single object on login