Third commit - user attributes fixed