Fixes 130

At least for now. Much more to do with networking and online/offline once remember me functionality is in place.