add user identity and cleanup