1 files changed, 7 insertions, 5 deletions
diff --git a/data/templates/ocserv/ocserv_passwd.tmpl b/data/templates/ocserv/ocserv_passwd.tmpl
index ffadb4860..30c79d66a 100644
--- a/data/templates/ocserv/ocserv_passwd.tmpl
+++ b/data/templates/ocserv/ocserv_passwd.tmpl
@@ -1,6 +1,8 @@
 #<username>:<group>:<hash>
-{% for user in username if username is defined %}
-{%   if not "disable" in username[user] %}
-{{ user }}:*:{{ username[user].hash }}
-{%   endif %}
-{% endfor %}
-\ No newline at end of file
+{% if username is vyos_defined %}
+{%     for user, user_config in username.items() %}
+{%         if user_config.disable is not vyos_defined %}
+{{ user }}:*:{{ user_config.hash }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+\ No newline at end of file