Make user schema less strict2

Supersedes #161