Merge branch 'branch-6.5'

diff --cc server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationStep.js
index 64f7eb6504c5bd39ad67d0c6099268943036b7ab,d7a6b741530ba5d29e4bffec2a18e256b2bd2d2d..16ad05c181ae6a4b093d635e0684cd95b3c07905
--- 1/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationStep.js
--- 2/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationStep.js
+++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationStep.js
@@@ -139,13 -147,12 +147,13 @@@ export default class OrganizationStep e
            })}
          />
          {translate('onboarding.organization.my_personal_organization')}
 -        <span className="note spacer-left">{this.state.personalOrganization}</span>
 +        <span className="note spacer-left">
-           {this.props.currentUser.login}
++          {this.state.personalOrganization}
 +        </span>
        </a>
 -    </div>
 -  );
 +    </div>;
  
 -  renderExistingOrganizationOption = () => (
 +  renderExistingOrganizationOption = () =>
      <div className="big-spacer-top">
        <a
          className="js-existing link-base-color link-no-underline"