diff --git a/client/coral-admin/src/containers/Configure/StreamSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js
index 568e0a075..950c5a2aa 100644
--- a/client/coral-admin/src/containers/Configure/StreamSettings.js
+++ b/client/coral-admin/src/containers/Configure/StreamSettings.js
@@ -32,6 +32,11 @@ const updateInfoBoxEnable = (updateSettings, infoBox) => () => {
   updateSettings({infoBoxEnable});
 };
 
+const updatePremodLinksEnable = (updateSettings, premodLinks) => () => {
+  const premodLinksEnable = !premodLinks;
+  updateSettings({premodLinksEnable});
+};
+
 const updateInfoBoxContent = (updateSettings) => (event) => {
   const infoBoxContent =  event.target.value;
   updateSettings({infoBoxContent});
@@ -92,6 +97,19 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => {
           </p>
         </div>
       </Card>
+      <Card className={`${styles.configSettingInfoBox} ${settings.premodLinksEnable ? on : off}`}>
+        <div className={styles.action}>
+          <Checkbox
+            onChange={updatePremodLinksEnable(updateSettings, settings.premodLinksEnable)}
+            checked={settings.premodLinksEnable} />
+        </div>
+        <div className={styles.content}>
+          {lang.t('configure.enable-premod-links')}
+          <p>
+            {lang.t('configure.enable-premod-links-text')}
+          </p>
+        </div>
+      </Card>
       <Card className={`${styles.configSettingInfoBox} ${settings.infoBoxEnable ? on : off}`}>
         <div className={styles.action}>
           <Checkbox
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 3a82af2cd..44f693ff5 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -19,6 +19,7 @@ const lang = new I18n(translations);
 
 const Comment = ({actions = [], ...props}) => {
   const links = linkify.getMatches(props.comment.body);
+  console.log('Links', links);
   const actionSummaries = props.comment.action_summaries;
   return (
     <li tabIndex={props.index}
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index cebc499ca..c729bb2e5 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -66,6 +66,8 @@
       "include-comment-stream": "Include Comment Stream Description for Readers.",
       "include-comment-stream-desc": "Write a message to be added to the top of your comment stream. Pose a topic, include community guidelines, etc.",
       "include-text": "Include your text here.",
+      "enable-premod-links": "Moderate all comments with links",
+      "enable-premod-links-text": "Automatically send comments with links to the moderation queue.",
       "comment-settings": "Settings",
       "embed-comment-stream": "Embed Stream",
       "banned-word-text": "Comments which contain these words or phrases (not case-sensitive) will be automatically removed from the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 73510d67a..3f6664cfc 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -3,6 +3,7 @@ const errors = require('../../errors');
 const AssetsService = require('../../services/assets');
 const ActionsService = require('../../services/actions');
 const CommentsService = require('../../services/comments');
+const linkify = require('linkify-it')();
 
 const Wordlist = require('../../services/wordlist');
 
@@ -162,7 +163,7 @@ const createPublicComment = (context, commentInput) => {
         }
 
         // If the comment contains a link.
-        if (settings.premodLinksEnable && /\S+\.\S+/.exec(comment.body)) {
+        if (settings.premodLinksEnable && linkify.test(comment.body)) {
           return ActionsService.insertUserAction({
             item_id: comment.id,
             item_type: 'COMMENTS',
diff --git a/package.json b/package.json
index 740063dd1..6f0fd24c1 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "inquirer": "^3.0.1",
     "jsonwebtoken": "^7.1.9",
     "kue": "^0.11.5",
+    "linkify-it": "^2.0.3",
     "lodash": "^4.16.6",
     "metascraper": "^1.0.6",
     "minimist": "^1.2.0",