diff --git a/suit/templates/admin/auth/user/change_password.html b/suit/templates/admin/auth/user/change_password.html
index 54417f1f..45270636 100644
--- a/suit/templates/admin/auth/user/change_password.html
+++ b/suit/templates/admin/auth/user/change_password.html
@@ -36,7 +36,7 @@
 
 {% block content %}
   <div id="content-main">
-    <form action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form" class="form-horizontal">
+    <form action="{{ form_url }}" method="post" id="{% firstof opts.model_name opts.module_name %}_form" class="form-horizontal">
       {% csrf_token %}{% block form_top %}{% endblock %}
       <div>
         {% if is_popup %}
diff --git a/suit/templates/admin/change_form.html b/suit/templates/admin/change_form.html
index 5efc35d2..08453a6b 100644
--- a/suit/templates/admin/change_form.html
+++ b/suit/templates/admin/change_form.html
@@ -18,7 +18,7 @@
     <!-- Warn on leaving unsaved form -->
     <script src="{% static 'suit/js/suit-form-confirm.js' %}"></script>
     <script type="text/javascript">
-      confirmExitIfModified('{{ opts.module_name }}_form', '{% trans 'You have unsaved changes' %}.');
+      confirmExitIfModified('{% firstof opts.model_name opts.module_name %}_form', '{% trans 'You have unsaved changes' %}.');
     </script>
   {% endif %}
 
@@ -83,7 +83,7 @@
   <div id="content-main" class="inner-two-columns">
 
     <form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post"
-          id="{{ opts.module_name }}_form" class="form-horizontal">
+          id="{% firstof opts.model_name opts.module_name %}_form" class="form-horizontal">
 
       <div class="inner-right-column">
 
@@ -182,7 +182,7 @@ <h4 class="italic-title">{% trans 'tools'|capfirst %}</h4>
                             showRelatedObjectLookupPopup(this);
                         });
                     {% if adminform and add %}
-                        $('form#{{ opts.model_name }}_form :input[type!=button][type!=submit]:visible:enabled:first').focus()
+                        $('form#{% firstof opts.model_name opts.module_name %}_form :input[type!=button][type!=submit]:visible:enabled:first').focus()
                     {% endif %}
                     });
                 })(django.jQuery);
diff --git a/suit/templates/admin/import_export/import.html b/suit/templates/admin/import_export/import.html
index 0026edf4..344d5c23 100644
--- a/suit/templates/admin/import_export/import.html
+++ b/suit/templates/admin/import_export/import.html
@@ -9,7 +9,7 @@
 {% block content %}
 
     {% if not confirm_form %}
-        <form action="{{ form_url }}" method="POST" id="{{ opts.module_name }}_form" enctype="multipart/form-data" class="form-horizontal">
+        <form action="{{ form_url }}" method="POST" id="{% firstof opts.model_name opts.module_name %}_form" enctype="multipart/form-data" class="form-horizontal">
             {% csrf_token %}