Pivotal rescue and user-search on login instead of refresh

quite a bit of refactoring. Everything works well though. 
@gschorkopf