Fixed user inconsistencies