diff --git a/docs/en_US/index.rst b/docs/en_US/index.rst
index 06604e0ad..1c0c8be78 100644
--- a/docs/en_US/index.rst
+++ b/docs/en_US/index.rst
@@ -190,4 +190,4 @@ pgAdmin is released under the
 liberal Open Source licence similar to BSD or MIT, and approved by the Open 
 Source Initiative. The copyright for the project source code, website and 
 documentation is attributed to the 
-`pgAdmin Development Team <http://www.pgadmin.org/development/team.php>`_.
+`pgAdmin Development Team <https://www.pgadmin.org/development/team.php>`_.
diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py
index da08305b4..2dc19a815 100644
--- a/pkg/pip/setup_pip.py
+++ b/pkg/pip/setup_pip.py
@@ -34,7 +34,7 @@ setup(
     description='PostgreSQL Tools',
     long_description='Administration and management tools for the PostgreSQL database.',
 
-    url='http://www.pgadmin.org/',
+    url='https://www.pgadmin.org/',
 
     # Author details
     author='The pgAdmin Development Team',
diff --git a/web/config.py b/web/config.py
index 0a4177d12..36f1632af 100644
--- a/web/config.py
+++ b/web/config.py
@@ -223,7 +223,7 @@ SECURITY_EMAIL_SUBJECT_PASSWORD_CHANGE_NOTICE = \
 UPGRADE_CHECK_ENABLED = True
 
 # Where should we get the data from?
-UPGRADE_CHECK_URL = 'http://www.pgadmin.org/versions.json'
+UPGRADE_CHECK_URL = 'https://www.pgadmin.org/versions.json'
 
 ##########################################################################
 # Storage Manager storage url config settings
diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py
index 47f2d08c6..2e9b68211 100644
--- a/web/pgadmin/browser/__init__.py
+++ b/web/pgadmin/browser/__init__.py
@@ -463,7 +463,7 @@ def index():
                                       product_name=config.APP_NAME,
                                       download_url=data['pgadmin4']['download_url'])
 
-            flash(msg, 'warning')
+                flash(msg, 'warning')
 
     return render_template(
             MODULE_NAME + "/index.html",
diff --git a/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html b/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
index 126b8b275..4d3065e3d 100644
--- a/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
+++ b/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
@@ -54,7 +54,7 @@
                     </a>
                 </div>
                 <div class="col-xs-3 dashboard-link">
-                    <a href="http://www.pgadmin.org" target="_new">
+                    <a href="https://www.pgadmin.org" target="_new">
                         <span class="fa fa-4x dashboard-icon fa-globe" aria-hidden="true"></span><br />
                         pgAdmin Website
                     </a>
diff --git a/web/pgadmin/help/__init__.py b/web/pgadmin/help/__init__.py
index aa2d3b383..904354a11 100644
--- a/web/pgadmin/help/__init__.py
+++ b/web/pgadmin/help/__init__.py
@@ -36,7 +36,7 @@ class HelpModule(PgAdminModule):
                      priority= 200,
                      target= '_blank',
                      icon='fa fa-external-link',
-                     url= 'http://www.pgadmin.org/' ),
+                     url= 'https://www.pgadmin.org/' ),
 
             MenuItem(name= 'mnu_postgresql_website',
                      label= gettext('PostgreSQL Website'),
@@ -59,7 +59,7 @@ class HelpModule(PgAdminModule):
                 priority=200,
                 title=gettext('pgAdmin Website'),
                 icon='fa fa-external-link',
-                content='http://www.pgadmin.org/'),
+                content='https://www.pgadmin.org/'),
 
             Panel(
                 name='pnl_postgresql_website',