diff --git a/basetheme_bootstrap/templates/registration/small_form_host.html b/basetheme_bootstrap/templates/registration/small_form_host.html
index a19b7e1aa41fc02b7b35e6d53ec1858aa415b1f3..fb5df9f1e3fe92de709b6a1a756a4d900a95f419 100644
--- a/basetheme_bootstrap/templates/registration/small_form_host.html
+++ b/basetheme_bootstrap/templates/registration/small_form_host.html
@@ -25,7 +25,7 @@
     {% block form %}
     <form method="post" enctype="multipart/form-data">
         {% csrf_token %}
-        {%if form%}{{ form|crispy }}{%endif%}
+        {%if form%}{%if form.helper%}{% crispy form %}{%else%}{{ form|crispy }}{%endif%}{%endif%}
         {%if cancel_url%}<a role="button" class="{{btn_cancel_classes|default:'btn btn-primary'}}" href="{{cancel_url}}">{{ cancel_text|default:"Cancel" }}</a>{%endif%}
         <div class="form-class {{btn_container_classes|default:'pull-right float-right'}}">
         <button class="{{btn_classes|default:'btn btn-primary'}}" type="submit">{{ submit_text|default:"OK" }}</button>
diff --git a/setup.py b/setup.py
index 13a94cb1830615ce4d8017df5613e70e32a5e349..857bc40c2dc12e935a702888d0aeca9113b1e985 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
 
 setup(
     name='django-basetheme-bootstrap',
-    version='0.2.47',
+    version='0.2.48',
     description='Django Basetheme Bootstrap',
     long_description=readme,
     author='Bryan Brancotte',