diff --git a/.meteor/packages b/.meteor/packages
index ef5326118a..9a715c698b 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -84,3 +84,4 @@ useraccounts:core
 useraccounts:flow-routing
 vsivsi:file-collection
 zimme:active-route
+aramk:quill
diff --git a/.meteor/versions b/.meteor/versions
index 26d03910dc..8ec38d7a57 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -20,6 +20,7 @@ apinf:autoform-bs-datepicker@1.1.2
 apinf:create-role-if-undefined@0.1.1
 apinf:first-admin@0.1.2
 apinf:restivus-swagger@0.2.1
+aramk:quill@0.1.1
 arillo:flow-router-helpers@0.5.2
 autoupdate@1.3.12
 babel-compiler@6.13.0
@@ -152,6 +153,7 @@ templating-tools@1.0.5
 tmeasday:publish-counts@0.8.0
 todda00:friendly-slugs@0.6.0
 tracker@1.1.1
+trever:quill@0.0.5
 twbs:bootstrap@3.3.6
 u2622:persistent-session@0.4.4
 ui@1.0.12
diff --git a/branding/client/autoform.js b/branding/client/autoform.js
new file mode 100644
index 0000000000..4bbf74e93c
--- /dev/null
+++ b/branding/client/autoform.js
@@ -0,0 +1,25 @@
+import { AutoForm } from 'meteor/aldeed:autoform';
+import Branding from '/branding/collection';
+
+AutoForm.hooks({
+  brandingEdit: {
+    onSuccess () {
+      // Get termsOfUse
+      const termsOfUse = this.currentDoc.termsOfUse;
+
+      // Get privacyPolicy
+      const privacyPolicy = this.currentDoc.termsOfUse;
+
+      // If editor is empty (has only this empty div)
+      // see https://github.com/quilljs/quill/issues/1235
+      if (termsOfUse === '<div><br></div>') {
+        Branding.update(this.docId, { $unset: { termsOfUse: '' } });
+      }
+
+      if (privacyPolicy === '<div><br></div>') {
+        Branding.update(this.docId, { $unset: { privacyPolicy: '' } });
+      }
+      return false;
+    },
+  },
+});
diff --git a/branding/client/branding.html b/branding/client/branding.html
index 2977435a37..463cb11665 100644
--- a/branding/client/branding.html
+++ b/branding/client/branding.html
@@ -25,6 +25,8 @@ <h3 class="panel-title">
               {{> afQuickField name='siteSlogan' }}
               {{> afQuickField name='colors' }}
               {{> afQuickField name='siteFooter' }}
+              {{> afQuickField name='privacyPolicy' type="quill" }}
+              {{> afQuickField name='termsOfUse' type="quill" }}
               {{> afQuickField name='socialMedia' }}
               <div id="form-buttons">
                 <button type="submit" class="btn btn-primary">
diff --git a/branding/client/lib/router.js b/branding/client/lib/router.js
index b983488f8c..f065c32fac 100644
--- a/branding/client/lib/router.js
+++ b/branding/client/lib/router.js
@@ -7,3 +7,17 @@ FlowRouter.route('/settings/branding', {
     BlazeLayout.render('masterLayout', { main: 'branding' });
   },
 });
+
+FlowRouter.route('/privacy-policy', {
+  name: 'privacyPolicy',
+  action () {
+    BlazeLayout.render('masterLayout', { main: 'privacyPolicy' });
+  },
+});
+
+FlowRouter.route('/terms-of-use', {
+  name: 'termsOfUse',
+  action () {
+    BlazeLayout.render('masterLayout', { main: 'termsOfUse' });
+  },
+});
diff --git a/branding/client/privacy_policy/privacyPolicy.html b/branding/client/privacy_policy/privacyPolicy.html
new file mode 100644
index 0000000000..b14cc5971d
--- /dev/null
+++ b/branding/client/privacy_policy/privacyPolicy.html
@@ -0,0 +1,10 @@
+<template name="privacyPolicy">
+  {{# if branding.privacyPolicy }}
+    <div class="container">
+      <h1>{{ branding.siteTitle }} {{_ "privacyPolicy_title" }}</h1>
+        {{{ branding.privacyPolicy }}}
+    </div>
+  {{ else }}
+    {{> notFound }}
+  {{/ if }}
+</template>
diff --git a/branding/client/privacy_policy/privacyPolicy.js b/branding/client/privacy_policy/privacyPolicy.js
new file mode 100644
index 0000000000..5bb0893cc4
--- /dev/null
+++ b/branding/client/privacy_policy/privacyPolicy.js
@@ -0,0 +1,17 @@
+import { Template } from 'meteor/templating';
+import Branding from '/branding/collection';
+
+Template.privacyPolicy.onCreated(function () {
+  // Get reference to template instance
+  const instance = this;
+
+  // Subscription to branding collection
+  instance.subscribe('branding');
+});
+
+Template.privacyPolicy.helpers({
+  branding () {
+    // Get Branding collection content
+    return Branding.findOne();
+  },
+});
diff --git a/branding/client/terms_of_use/termsOfUse.html b/branding/client/terms_of_use/termsOfUse.html
new file mode 100644
index 0000000000..459bf16f20
--- /dev/null
+++ b/branding/client/terms_of_use/termsOfUse.html
@@ -0,0 +1,10 @@
+<template name="termsOfUse">
+  {{# if branding.termsOfUse }}
+    <div class="container">
+      <h1>{{ branding.siteTitle }} {{_ "termsOfUse_title" }}</h1>
+        {{{ branding.termsOfUse }}}
+    </div>
+  {{ else }}
+    {{> notFound }}
+  {{/ if }}
+</template>
diff --git a/branding/client/terms_of_use/termsOfUse.js b/branding/client/terms_of_use/termsOfUse.js
new file mode 100644
index 0000000000..4c83421eab
--- /dev/null
+++ b/branding/client/terms_of_use/termsOfUse.js
@@ -0,0 +1,17 @@
+import { Template } from 'meteor/templating';
+import Branding from '/branding/collection';
+
+Template.termsOfUse.onCreated(function () {
+  // Get reference to template instance
+  const instance = this;
+
+  // Subscription to branding collection
+  instance.subscribe('branding');
+});
+
+Template.termsOfUse.helpers({
+  branding () {
+    // Get Branding collection content
+    return Branding.findOne();
+  },
+});
diff --git a/branding/collection/schema.js b/branding/collection/schema.js
index 9713bc2ec7..1b6f5c391a 100644
--- a/branding/collection/schema.js
+++ b/branding/collection/schema.js
@@ -42,6 +42,20 @@ Branding.schema = new SimpleSchema({
     type: String,
     optional: true,
   },
+  privacyPolicy: {
+    type: String,
+    optional: true,
+    autoform: {
+      rows: 5,
+    },
+  },
+  termsOfUse: {
+    type: String,
+    optional: true,
+    autoform: {
+      rows: 5,
+    },
+  },
   socialMedia: {
     type: [Object],
     optional: true,
diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 1cdb80ac38..09c953201f 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -357,6 +357,8 @@
   "homeBody_section3_text": "APinf is powered by API Umbrella and builds a dashboard on top of the API Umbrella features. The solution is fully open source licensed with MIT. It is written in Meteor.js and D3. We like to collaborate, to listen to our users and want to encourage people to become contributors.",
   "homeBody_section3_text_extra": "Find us in ",
   "homeFooter_dashboardLink_text": "Dashboard",
+  "homeFooter_privacyPolicy_text": "Privacy Policy",
+  "homeFooter_termsOfUse_text": "Terms of Use",
   "homeFooter_signIn": "Sign In",
   "homeFooter_signUp": "Sign Up",
   "importApiConfiguration_errorMessage": "Config file must be either in .YAML, .YML, .JSON or .TXT format.",
@@ -454,6 +456,7 @@
   "organizationSettingsDelete_text_information": "The organization information will be removed and this action cannot be undone.",
   "organizationSettingsDelete_title": "Delete the Organization profile",
   "organizationSettingsDelete_panelTitle": "Delete",
+  "privacyPolicy_title": "Privacy Policy",
   "profile_Header": "Profile",
   "profile_UpdateButton": "Update",
   "profile_setUsername": "Please set your username.",
@@ -605,6 +608,14 @@
           "siteSlogan": {
               "label": "Site slogan"
           },
+          "privacyPolicy": {
+            "label": "Privacy Policy",
+            "placeholder": "Add your privacy policy here"
+          },
+          "termsOfUse": {
+            "label": "Terms of Use",
+            "placeholder": "Add your terms of use here"
+          },
           "colors": {
               "label": "Colors",
               "primary": {
@@ -932,6 +943,7 @@
   "statusCodeCountsChart_title": "HTTP Status Codes",
   "statusCodeCountsChart_help_text": "You can use this chart to see the HTTP responses generated by your API for the requests it receives for a specific time period. You can filter the chart with response type for a single API or a combination of them. The overview information and other charts will be updated when you interact with HTTP Status Codes.",
   "swaggerUi_swaggerDocumentInvalidText": "Swagger document is not valid.",
+  "termsOfUse_title": "Terms of Use",
   "timeFrameSelectPicker_from": "from",
   "timeFrameSelectPicker_to": "to",
   "updatePassword_legend_text": "Update password",
diff --git a/home/client/footer/homeFooter.html b/home/client/footer/homeFooter.html
index b4ae00c5a6..05a718537e 100644
--- a/home/client/footer/homeFooter.html
+++ b/home/client/footer/homeFooter.html
@@ -13,11 +13,29 @@
             {{/ each }}
           </ul>
         </div>
-        <div class="col-lg-8 col-lg-push-1">
+        <div class="col-lg-5">
           <p class="footer-text">
             {{ branding.siteFooter }}
           </p>
         </div>
+        <div class="col-lg-3">
+          <ul class="list-inline">
+            {{# if branding.privacyPolicy }}
+              <li>
+                <a href="{{ pathFor 'privacyPolicy' }}">
+                  {{_ "homeFooter_privacyPolicy_text" }}
+                </a>
+              </li>
+            {{/ if }}
+            {{# if branding.termsOfUse }}
+              <li>
+                <a href="{{ pathFor 'termsOfUse' }}">
+                  {{_  "homeFooter_termsOfUse_text" }}
+                </a>
+              </li>
+            {{/ if }}
+          </ul>
+        </div>
         <div class="col-lg-2">
           <ul class="list-inline quicklinks">
             {{# if currentUser }}
diff --git a/users/client/lib/accounts_config.js b/users/client/lib/accounts_config.js
index 08d4d27e54..bcf81b813b 100644
--- a/users/client/lib/accounts_config.js
+++ b/users/client/lib/accounts_config.js
@@ -26,6 +26,9 @@ AccountsTemplates.configure({
   positiveValidation: false,
   positiveFeedback: true,
   showValidating: true,
+  // Privacy Policy and Terms of Use
+  privacyUrl: 'privacy-policy',
+  termsUrl: 'terms-of-use',
 });
 
 // rearranging the fields on Sign-Up, so that username comes first.