Fixes bug for non-standard user model