diff --git a/README.rst b/README.rst
index 14fac1d..d9c6dc6 100644
--- a/README.rst
+++ b/README.rst
@@ -39,6 +39,10 @@ Using Django Admin
 ~~~~~~~~~~~~~~~~~~
 
 The credentials user interface will be available at http://credentials.local.overhang.io for a local instance, and at ``CREDENTIALS_HOST`` (by  default: ``http(s)://credentials.<your lms host>``) in production. In order to run commands from the UI login with an admin user at: http://credentials.local.overhang.io/admin/. User should be able to authenticate with the same username and password that he used for his lms.
+User can also create superuser for credentials using the below command
+::
+
+    tutor local run credentials ./manage.py createsuperuser
 
 Configuration
 -------------
@@ -52,10 +56,8 @@ Application configuration
 - ``CREDENTIALS_MYSQL_PASSWORD`` (default: ``"{{ 8|random_string }}"``)
 - ``CREDENTIALS_DOCKER_IMAGE`` (default: ``"{{ DOCKER_REGISTRY }}overhangio/openedx-credentials:{{ CREDENTIALS_VERSION }}"``)
 - ``CREDENTIALS_EXTRA_PIP_REQUIREMENTS`` (default: ``[]``)
-- ``CREDENTIALS_PRIVACY_POLICY_URL``  (default: ``"LMS_HOST/pricacy-policy"``)
 - ``CREDENTIALS_SITE_NAME`` (default: ``"LMS_HOST"``)
-- ``CREDENTIALS_TOS_URL`` (default: ``"{{ LMS_HOST }}/tos"``)
-- ``CREDENTIALS_REPOSITORY`` (default: ``"https://github.com/edx/credentials.git"``)
+- ``CREDENTIALS_REPOSITORY`` (default: ``"https://github.com/openedx/credentials.git"``)
 - ``CREDENTIALS_REPOSITORY_VERSION`` (default: ``"{{ OPENEDX_COMMON_VERSION }}"``)
 
 Marketing & Theming
diff --git a/tutorcredentials/plugin.py b/tutorcredentials/plugin.py
index 511f9b6..881b5cc 100644
--- a/tutorcredentials/plugin.py
+++ b/tutorcredentials/plugin.py
@@ -31,8 +31,6 @@ tutor_hooks.Filters.CONFIG_DEFAULTS.add_items(
         ("CREDENTIALS_EXTRA_PIP_REQUIREMENTS", []),
         ("CREDENTIALS_FAVICON_URL", "https://edx-cdn.org/v3/default/favicon.ico"),
         ("CREDENTIALS_HOST", "credentials.{{ LMS_HOST }}"),
-        ("CREDENTIALS_LMS_URL", "http://{{ LMS_HOST }}"),
-        ("CREDENTIALS_LMS_URL_ROOT", "http://{{ LMS_HOST }}"),
         ("CREDENTIALS_LOGO_TRADEMARK_URL", "https://edx-cdn.org/v3/default/logo-trademark.svg"),
         ("CREDENTIALS_LOGO_TRADEMARK_URL_PNG", "https://edx-cdn.org/v3/default/logo-trademark.png"),
         ("CREDENTIALS_LOGO_TRADEMARK_URL_SVG", "https://edx-cdn.org/v3/default/logo-trademark.svg"),
@@ -49,7 +47,6 @@ tutor_hooks.Filters.CONFIG_DEFAULTS.add_items(
         ("CREDENTIALS_OAUTH2_KEY_SSO", "credentials-key-sso"),
         ("CREDENTIALS_OAUTH2_KEY_SSO_DEV", "credentials-key-sso-dev"),
         ("CREDENTIALS_PLATFORM_NAME", "{{ PLATFORM_NAME }}"),
-        ("CREDENTIALS_PRIVACY_POLICY_URL", "{{ LMS_HOST }}/privacy-policy"),
         ("CREDENTIALS_SITE_NAME", "{{ LMS_HOST }}"),
         ("CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS", False),
         ("CREDENTIALS_SOCIAL_AUTH_EDX_OAUTH2_ISSUER", "https://{{ LMS_HOST }}"),
@@ -57,7 +54,6 @@ tutor_hooks.Filters.CONFIG_DEFAULTS.add_items(
         ("CREDENTIALS_SOCIAL_AUTH_EDX_OAUTH2_KEY", "credentials-sso-key"),
         ("CREDENTIALS_SOCIAL_AUTH_EDX_OAUTH2_LOGOUT_URL", "{{ LMS_HOST }}/logout"),
         ("CREDENTIALS_THEME_NAME", "edx-theme"),
-        ("CREDENTIALS_TOS_URL", "{{ LMS_HOST }}/tos"),
         ("CREDENTIALS_REPOSITORY", "https://github.com/edx/credentials.git"),
         ("CREDENTIALS_REPOSITORY_VERSION", "{{ OPENEDX_COMMON_VERSION }}"),
     ]
diff --git a/tutorcredentials/templates/credentials/tasks/credentials/init b/tutorcredentials/templates/credentials/tasks/credentials/init
index 2d69313..098ea70 100644
--- a/tutorcredentials/templates/credentials/tasks/credentials/init
+++ b/tutorcredentials/templates/credentials/tasks/credentials/init
@@ -7,13 +7,13 @@ echo "credentials service - ./manage.py migrate create_or_update_site"
   --site-domain "{{ CREDENTIALS_HOST }}" \
   --site-name "{{ CREDENTIALS_SITE_NAME }}" \
   --platform-name "{{ PLATFORM_NAME }}" \
-  --lms-url-root "{{ CREDENTIALS_LMS_URL_ROOT }}" \
+  --lms-url-root "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}{{ LMS_HOST }}" \
   --catalog-api-url "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}{{ DISCOVERY_HOST }}/api/v1/" \
-  --tos-url "{{ CREDENTIALS_TOS_URL }}" \
-  --privacy-policy-url "{{ CREDENTIALS_PRIVACY_POLICY_URL }}" \
-  --homepage-url "{{ CREDENTIALS_LMS_URL }}" \
+  --tos-url "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}{{ LMS_HOST }}/tos" \
+  --privacy-policy-url "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}{{ LMS_HOST }}/privacy-policy" \
+  --homepage-url "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}{{ LMS_HOST }}" \
   --company-name "{{ PLATFORM_NAME }}" \
-  --certificate-help-url "{{ CREDENTIALS_LMS_URL }}" \
+  --certificate-help-url "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}{{ LMS_HOST }}" \
   --theme-name "{{ CREDENTIALS_THEME_NAME }}"
 
 # for development
@@ -21,11 +21,11 @@ echo "credentials service - ./manage.py migrate create_or_update_site"
   --site-domain "{{ CREDENTIALS_HOST }}" \
   --site-name "{{ CREDENTIALS_SITE_NAME }}" \
   --platform-name "{{ PLATFORM_NAME }}" \
-  --lms-url-root "{{ CREDENTIALS_LMS_URL_ROOT }}:8000" \
-  --catalog-api-url "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}{{ DISCOVERY_HOST }}/api/v1/" \
-  --tos-url "{{ LMS_HOST }}:8000/tos" \
-  --privacy-policy-url "{{ LMS_HOST }}:8000/privacy-policy" \
-  --homepage-url "{{ CREDENTIALS_LMS_URL }}:8000" \
+  --lms-url-root "http://{{ LMS_HOST }}:8000" \
+  --catalog-api-url "http://{{ DISCOVERY_HOST }}:8381/api/v1/" \
+  --tos-url "http://{{ LMS_HOST }}:8000/tos" \
+  --privacy-policy-url "http://{{ LMS_HOST }}:8000/privacy-policy" \
+  --homepage-url "http://{{ LMS_HOST }}:8000" \
   --company-name "{{ PLATFORM_NAME }}" \
-  --certificate-help-url "{{ CREDENTIALS_LMS_URL }}:8000" \
+  --certificate-help-url "http://{{ LMS_HOST }}:8000" \
   --theme-name "{{ CREDENTIALS_THEME_NAME }}"