Merge "Fix Confirm/Choose Credentials strings related to profile"