Sets default values to User attributes, as well as some minor stuff
Merge fix, I think
Merge conflictsn