Makes it possible to set user in attributes
Merge branch 'user' into patched