Refactoring, fixed a merge mistake
Less runtime reflection
Temporary measure: Update current to real location on login