diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json
index ae0aab2a9..8c65ba5e1 100644
--- a/dashboard-ui/bower_components/iron-selector/.bower.json
+++ b/dashboard-ui/bower_components/iron-selector/.bower.json
@@ -38,7 +38,7 @@
     "tag": "v1.0.7",
     "commit": "0b2f484ac3b1b03400da2d38b0f543f3688150a4"
   },
-  "_source": "git://github.com/polymerelements/iron-selector.git",
+  "_source": "git://github.com/PolymerElements/iron-selector.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-selector"
+  "_originalSource": "PolymerElements/iron-selector"
 }
\ No newline at end of file
diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html
index f6aa680da..aa9b063cb 100644
--- a/dashboard-ui/connectlogin.html
+++ b/dashboard-ui/connectlogin.html
@@ -32,12 +32,13 @@
                     <div class="fieldDescription" style="text-align:center;">${TextConnectToServerManually}</div>
                 </div>
 
-                <div class="newUsers" style="margin-top:2em;">
+                <div class="newUsers" style="margin-top: 2em;">
                     <h2 style="text-align: left;">${HeaderNewUsers}</h2>
                     <a href="http://emby.media/community/index.php?app=core&module=global&section=register" target="_blank" class="clearLink">
                         <paper-button raised class="submit block btnSignupForConnect"><iron-icon icon="add"></iron-icon><span>${ButtonSignUp}</span></paper-button>
                     </a>
                 </div>
+                <div class="terms hide fieldDescription" style="margin-top: 2em; color: #ccc;"></div>
             </form>
 
             <form class="manualServerForm" style="margin: 0 auto;display:none;">
diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js
index 9dceb8280..ddb06077c 100644
--- a/dashboard-ui/scripts/connectlogin.js
+++ b/dashboard-ui/scripts/connectlogin.js
@@ -244,6 +244,15 @@
             Dashboard.navigate('connectlogin.html?mode=connect');
         });
 
+        var terms = page.querySelector('.terms');
+        terms.innerHTML = Globalize.translate('LoginDisclaimer') + "<div style='margin-top:5px;'><a href='http://emby.media/terms' target='_blank'>" + Globalize.translate('TermsOfUse') + "</a></div>";
+
+        if (AppInfo.isNativeApp) {
+            terms.classList.add('hide');
+        } else {
+            terms.classList.remove('hide');
+        }
+
     }).on('pagebeforeshow', "#connectLoginPage", function () {
 
         var page = this;
diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json
index 63a5cf265..a3400d264 100644
--- a/dashboard-ui/strings/javascript/javascript.json
+++ b/dashboard-ui/strings/javascript/javascript.json
@@ -908,5 +908,7 @@
     "EmbyPremiereMonthly": "Emby Premiere Monthly",
     "EmbyPremiereMonthlyWithPrice": "Emby Premiere Monthly {0}",
     "HeaderEmailAddress": "E-Mail Address",
-    "TextPleaseEnterYourEmailAddressForSubscription": "Please enter your e-mail address."
+    "TextPleaseEnterYourEmailAddressForSubscription": "Please enter your e-mail address.",
+    "LoginDisclaimer": "Emby is designed to help you manage your personal media library, such as home videos and photos. Please see our terms of use. Downloading any Emby software constitutes acceptance of these terms.",
+    "TermsOfUse": "Terms of use"
 }