diff --git a/src/main/resources/eip-odoo-openmrs.properties b/src/main/resources/eip-odoo-openmrs.properties
index 13995782..2ebbb7a6 100644
--- a/src/main/resources/eip-odoo-openmrs.properties
+++ b/src/main/resources/eip-odoo-openmrs.properties
@@ -1,17 +1,18 @@
 # *********************** OAuth2 Configuration ********************************************************************
-#Enabled Oauth when set to true
+# Enabled Oauth when set to true, defaults to false.
 oauth.enabled=${OAUTH_ENABLED:false}
 
-#The client Id of the account
-oauth.access.token.uri=${OAUTH_ACCESS_TOKEN_URL}
+# The client Id of the account, defaults to empty.
+oauth.access.token.uri=${OAUTH_ACCESS_TOKEN_URL:}
 
-#The client Id of the account to use to authenticate
-oauth.client.id=${OAUTH_CLIENT_ID}
+# The client Id of the account to use to authenticate, defaults to empty.
+oauth.client.id=${OAUTH_CLIENT_ID:}
 
-#The client secret of the account to use to authenticate
-oauth.client.secret=${OAUTH_CLIENT_SECRET}
-#Authentication scope, can be multiple values separated by commas
-oauth.client.scope=${OAUTH_CLIENT_SCOPE}
+# The client secret of the account to use to authenticate, defaults to empty.
+oauth.client.secret=${OAUTH_CLIENT_SECRET:}
+
+# Authentication scope, can be multiple values separated by commas, defaults to empty.
+oauth.client.scope=${OAUTH_CLIENT_SCOPE:}
 # ----------------------------------------------------------------------------------------------------------------------
 
 # *********************** Odoo configuration **************************************************************************