Persistent login - close #4