User table fix.
Merge branch 'thomas'