diff --git a/src/components/modal/social/container.jsx b/src/components/modal/social/container.jsx
index 767415a7e..64002188a 100644
--- a/src/components/modal/social/container.jsx
+++ b/src/components/modal/social/container.jsx
@@ -22,7 +22,6 @@ class SocialModal extends React.Component {
             'handleCopyProjectLink',
             'hideEmbedResult',
             'hideLinkResult',
-            'linkUrl',
             'setEmbedTextarea',
             'setLinkTextarea'
         ]);
@@ -67,9 +66,6 @@ class SocialModal extends React.Component {
         this.setState({showLinkResult: false});
         this.linkCopyTimeoutId = null;
     }
-    linkUrl () {
-        return `${window.location.origin}${window.location.pathname}`;
-    }
     setEmbedTextarea (textarea) {
         this.embedTextarea = textarea;
         return textarea;
@@ -98,7 +94,7 @@ class SocialModal extends React.Component {
                 fbUrl={social.facebookIntentLink(projectId)}
                 googleClassroomUrl={social.googleClassroomIntentLink(projectId)}
                 isOpen={this.props.isOpen}
-                linkUrl={this.linkUrl()}
+                projectUrl={social.projectUrl(projectId)}
                 setEmbedTextarea={this.setEmbedTextarea}
                 setLinkTextarea={this.setLinkTextarea}
                 showEmbedResult={this.state.showEmbedResult}
diff --git a/src/components/modal/social/presentation.jsx b/src/components/modal/social/presentation.jsx
index e43ae067f..a21741265 100644
--- a/src/components/modal/social/presentation.jsx
+++ b/src/components/modal/social/presentation.jsx
@@ -15,10 +15,10 @@ const SocialModalPresentation = ({
     embedHtml,
     intl,
     isOpen,
-    linkUrl,
     onCopyEmbed,
     onCopyProjectLink,
     onRequestClose,
+    projectUrl,
     setEmbedTextarea,
     setLinkTextarea,
     showEmbedResult,
@@ -72,7 +72,7 @@ const SocialModalPresentation = ({
                             className="social-form social-input"
                             name="link"
                             ref={textarea => setLinkTextarea(textarea)}
-                            value={linkUrl}
+                            value={projectUrl}
                         />
                     </FlexRow>
                 </div>
@@ -122,10 +122,10 @@ SocialModalPresentation.propTypes = {
     embedHtml: PropTypes.string,
     intl: intlShape,
     isOpen: PropTypes.bool,
-    linkUrl: PropTypes.string,
     onCopyEmbed: PropTypes.func,
     onCopyProjectLink: PropTypes.func,
     onRequestClose: PropTypes.func,
+    projectUrl: PropTypes.string,
     setEmbedTextarea: PropTypes.func,
     setLinkTextarea: PropTypes.func,
     showEmbedResult: PropTypes.bool,
diff --git a/src/lib/social.js b/src/lib/social.js
index a23da86ba..f05219b89 100644
--- a/src/lib/social.js
+++ b/src/lib/social.js
@@ -1,5 +1,12 @@
 module.exports = {};
 
+module.exports.projectUrl = projectId => {
+    if (projectId) {
+        return `https://scratch.mit.edu/projects/${projectId}`;
+    }
+    return '';
+};
+
 module.exports.embedHtml = projectId => {
     if (projectId) {
         return `<iframe src="https://scratch.mit.edu/projects/${projectId}/embed" ` +
diff --git a/src/views/preview/project-view.jsx b/src/views/preview/project-view.jsx
index 5b943d3c6..903d01fd4 100644
--- a/src/views/preview/project-view.jsx
+++ b/src/views/preview/project-view.jsx
@@ -382,6 +382,12 @@ class Preview extends React.Component {
     handleAddToStudioClose () {
         this.setState({addToStudioOpen: false});
     }
+    handleSocialClick () {
+        this.setState({socialOpen: true});
+    }
+    handleSocialClose () {
+        this.setState({socialOpen: false});
+    }
     handleReportSubmit (formData) {
         const submit = data => this.props.reportProject(this.state.projectId, data, this.props.user.token);
         if (this.getProjectThumbnail) {
@@ -580,12 +586,6 @@ class Preview extends React.Component {
             this.props.user.token
         );
     }
-    handleSocialClick () {
-        this.setState({socialOpen: true});
-    }
-    handleSocialClose () {
-        this.setState({socialOpen: false});
-    }
     initCounts (favorites, loves) {
         this.setState({
             favoriteCount: favorites,
diff --git a/src/views/teacherregistration/teacherregistration.jsx b/src/views/teacherregistration/teacherregistration.jsx
index ce7df4f51..cc8bda902 100644
--- a/src/views/teacherregistration/teacherregistration.jsx
+++ b/src/views/teacherregistration/teacherregistration.jsx
@@ -3,7 +3,6 @@ const connect = require('react-redux').connect;
 const defaults = require('lodash.defaultsdeep');
 const PropTypes = require('prop-types');
 const React = require('react');
-// const formik = require('formik');
 
 const api = require('../../lib/api');
 const injectIntl = require('../../lib/intl.jsx').injectIntl;