Merge "Make the default user the current user (not 0)"