Merge "Fix "--user" handling"