User keys

To allow for scripted access, etc.
I've reverted this change. Should be ok now.