diff --git a/lib/discourse.sh b/lib/discourse.sh
index 8d15f78..5a1e487 100644
--- a/lib/discourse.sh
+++ b/lib/discourse.sh
@@ -23,6 +23,8 @@ services:
     container_name: discourse
     hostname: discourse.$DOMAIN
     restart: always
+    extra_hosts:
+      - "authelia.$DOMAIN:5.161.240.73"
     networks:
       core:
         ipv4_address: 192.168.0.43
@@ -41,6 +43,8 @@ services:
     container_name: discoursesidekiq
     hostname: discoursesidekiq.$DOMAIN
     restart: always
+    extra_hosts:
+      - "authelia.$DOMAIN:5.161.240.73"
     networks:
       core:
         ipv4_address: 192.168.0.44
@@ -60,6 +64,7 @@ EOF
 DISCOURSE_SECRET=$(create_password);
 REDIS_SECRET=$(awk -F= '/REDIS_PASSWORD/ { print $2 }' /federated/apps/redis/.env)
 [[ "${PLUS}" = "true" ]] && sed -i "s/letsencrypt/httpresolver/g" /federated/apps/discourse/docker-compose.yml
+[[ -z "${ADMINPASS}" ]] && ADMINPASS=$(create_password)
 
 cat > /federated/apps/discourse/.env <<EOF
 IMAGE_VERSION="3.3.3"
@@ -119,11 +124,26 @@ start_discourse() {
   # Start service with command to make sure it's up before proceeding
   start_service "discourse" "nc -z 192.168.0.43 3000 &> /dev/null" "70"
 
+  docker exec postgresql psql -U discourse -c "update users set username='admin@$DOMAIN' where username='admin';" &> /dev/null
+  docker exec postgresql psql -U discourse -c "update users set username_lower='admin@$DOMAIN' where username_lower='admin';" &> /dev/null
+  docker exec postgresql psql -U discourse -c "update site_settings set value='discourse@$DOMAIN' where name='notification_email';" &> /dev/null
+
   if [[ "${PLUS}" != "true" ]]; then
     docker exec pdns pdnsutil add-record $DOMAIN discourse A 86400 $EXTERNALIP &> /dev/null
     docker exec pdns pdnsutil add-record $DOMAIN forum A 86400 $EXTERNALIP &> /dev/null
   fi
 
+  docker exec discourse bash -c "cd /opt/bitnami/discourse && RAILS_ENV=production bundle exec rake plugin:install repo=https://github.com/discourse/discourse-openid-connect"
+  docker exec discourse bash -c "cd /opt/bitnami/discourse && RAILS_ENV=production bundle exec rake assets:precompile"
+  docker exec postgresql psql -U discourse -c "insert into site_settings (id, name, data_type, value, created_at, updated_at) VALUES ('31', 'openid_connect_enabled', '5', 't', NOW(), NOW());"
+  docker exec postgresql psql -U discourse -c "insert into site_settings (id, name, data_type, value, created_at, updated_at) VALUES ('32', 'openid_connect_discovery_document', '1', 'https://authelia.$DOMAIN/.well-known/openid-configuration', NOW(), NOW());"
+  docker exec postgresql psql -U discourse -c "insert into site_settings (id, name, data_type, value, created_at, updated_at) VALUES ('33', 'openid_connect_client_id', '1', 'discourse', NOW(), NOW());"
+  docker exec postgresql psql -U discourse -c "insert into site_settings (id, name, data_type, value, created_at, updated_at) VALUES ('34', 'openid_connect_authorize_scope', '1', 'openid email profile', NOW(), NOW());"
+  docker exec postgresql psql -U discourse -c "insert into site_settings (id, name, data_type, value, created_at, updated_at) VALUES ('36', 'openid_connect_client_secret', '1', 'asdfsaf123231x23432432', NOW(), NOW());"
+
+  /federated/bin/stop discourse
+  /federated/bin/start discourse
+
   echo -ne "done.\n"
 }
 email_discourse() {