finished user and user login 8/18/14