Finishing up user related code