I have no idea what I was thinking of here...
Bugfix - lookup into wrong dict
user detail grabber tweaks