Merge "Properly quote <username>"