Merge "Changed user login logic to use less expensive touch() method"