diff --git a/dockers/docker-snmp/snmpd.conf.j2 b/dockers/docker-snmp/snmpd.conf.j2
index 308b5999f753..b83fbffda025 100644
--- a/dockers/docker-snmp/snmpd.conf.j2
+++ b/dockers/docker-snmp/snmpd.conf.j2
@@ -32,8 +32,10 @@ agentAddress udp6:161
                                                  #  system + hrSystem groups only
 view   systemonly  included   .1.3.6.1.2.1.1
 view   systemonly  included   .1.3.6.1.2.1.25.1
+
                                                  #  Default access to basic system info
 
+
 {% if SNMP_COMMUNITY is defined %}
 {% for community in SNMP_COMMUNITY %}
 {% if SNMP_COMMUNITY[community]['TYPE'] == 'RO' %}
@@ -56,15 +58,16 @@ rwcommunity6 {{ community }}
 {% for user in SNMP_USER %}
 {% if SNMP_USER[user]['SNMP_USER_PERMISSION'] == 'RO' %}
 rouser {{ user }} {{ SNMP_USER[user]['SNMP_USER_TYPE'] }}
-CreateUser {{ user }} {{ SNMP_USER[user]['SNMP_USER_AUTH_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_AUTH_PASSWORD'] }} {{  SNMP_USER[user]['SNMP_USER_ENCRYPTION_TYPE'] }} {{  SNMP_USER[user]['SNMP_USER_ENCRYPTION_PASSWORD'] }}
-{% else %}
+CreateUser {{ user }} {{ SNMP_USER[user]['SNMP_USER_AUTH_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_AUTH_PASSWORD'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_PASSWORD'] }}
+{% elif SNMP_USER[user]['SNMP_USER_PERMISSION'] == 'RW' %}
 rwuser {{ user }} {{ SNMP_USER[user]['SNMP_USER_TYPE'] }}
-CreateUser {{ user }} {{ SNMP_USER[user]['SNMP_USER_AUTH_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_AUTH_PASSWORD'] }} {{  SNMP_USER[user]['SNMP_USER_ENCRYPTION_TYPE'] }} {{  SNMP_USER[user]['SNMP_USER_ENCRYPTION_PASSWORD'] }}
+CreateUser {{ user }} {{ SNMP_USER[user]['SNMP_USER_AUTH_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_AUTH_PASSWORD'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_TYPE'] }} {{ SNMP_USER[user]['SNMP_USER_ENCRYPTION_PASSWORD'] }}
 {% endif %}
 {% endfor %}
 {% else %}
 {% endif %}
 
+
 ###############################################################################
 #
 #  SYSTEM INFORMATION
@@ -72,6 +75,7 @@ CreateUser {{ user }} {{ SNMP_USER[user]['SNMP_USER_AUTH_TYPE'] }} {{ SNMP_USER[
 
 #  Note that setting these values here, results in the corresponding MIB objects being 'read-only'
 #  See snmpd.conf(5) for more details
+
 {% if SNMP is defined and SNMP.LOCATION is defined %}
 sysLocation    {{ SNMP.LOCATION.Location }}
 {% else %}
@@ -82,6 +86,7 @@ sysContact     {{ SNMP.CONTACT.keys()[0] }} {{ SNMP.CONTACT.values()[0] }}
 {% else %}
 sysContact     Azure Cloud Switch vteam <linuxnetdev@microsoft.com>
 {% endif %}
+
                                                  # Application + End-to-End layers
 sysServices    72