Merge pull request #393 from sghai/master

Fixed complier exception: No such namespace: login
Come back out of the admin menu to figure out what org we're on
System-details: Edit system-name