diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index 85e38ce1c..cdb13b3ce 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -204,9 +204,15 @@ module.exports = {
             return (
                 <Slide className="registration-step choose-password-step">
                     <h2>{formatMessage({id: 'registration.choosePasswordStepTitle'})}</h2>
+                    <p className="description">
+                        <intl.FormattedMessage id="registration.choosePasswordStepDescription" />
+                        <Tooltip title={'?'}
+                                 tipContent={formatMessage({id: 'registration.choosePasswordStepTooltip'})} />
+                    </p>
+
                     <Card>
                         <Form onValidSubmit={this.props.onNextStep}>
-                            <Input label={formatMessage({id: 'general.password'})}
+                            <Input label={formatMessage({id: 'registration.newPassword'})}
                                    type={this.state.showPassword ? 'text' : 'password'}
                                    name="user.password"
                                    validations={{
diff --git a/src/l10n.json b/src/l10n.json
index 048410c5c..80c0e4a29 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -108,7 +108,9 @@
 
     "registration.checkOutResources": "Get Started with Resources",
     "registration.checkOutResourcesDescription": "Explore materials for educators and facilitators written by the Scratch Team, including <a href='/educators#resources'>tips, tutorials, and guides</a>.",
-    "registration.choosePasswordStepTitle": "Choose a password",
+    "registration.choosePasswordStepDescription": "Type in a new password for your account. You will use this password the next time you log into Scratch.",
+    "registration.choosePasswordStepTitle": "Create a password",
+    "registration.choosePasswordStepTooltip": "Don't use your name or anything that's easy for someone else to guess.",
     "registration.classroomInviteStepDescription": "has invited you to join the class:",
     "registration.confirmYourEmail": "Confirm Your Email",
     "registration.confirmYourEmailDescription": "If you haven't already, please click the link in the confirmation email sent to:",
@@ -118,6 +120,7 @@
     "registration.lastStepDescription": "We are currently processing your application. ",
     "registration.mustBeNewStudent": "You must be a new student to complete your registration",
     "registration.nameStepTooltip": "This information is used for verification and to aggregate usage statistics.",
+    "registration.newPassword": "New Password",
     "registration.nextStep": "Next Step",
     "registration.personalStepTitle": "Personal Information",
     "registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure",