diff --git a/.gitignore b/.gitignore
index d8443f0..d991603 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ backup/
 .[a-zA-Z]*
 local_settings.py
 sample.xlsx
+venv/
diff --git a/src/membership/forms.py b/src/membership/forms.py
index 6126566..76691e4 100644
--- a/src/membership/forms.py
+++ b/src/membership/forms.py
@@ -25,18 +25,14 @@ class MembershipForm(forms.ModelForm):
         help_text=_('Input format: yyyy-mm-dd')
     )
     email = forms.EmailField(label=_('Email'), required=True)
-    required_membership_fields = (
-        'first_name', 'last_name', 'birthday',
-        'street_name', 'post_code', 'city'
-    )
+    required_membership_fields = ('first_name', 'last_name', 'birthday')
 
     class Meta:
         """get the user model dyamicly"""
         model = auth.get_user_model()
         fields = (
-            'username', 'gender', 'first_name', 'last_name', 'email', 'avatar',
-            'website', 'membership', 'birthday', 'telephone', 'street_name',
-            'post_code', 'city'
+            'username', 'email', 'avatar',
+            'membership', 'first_name', 'last_name',    'birthday',
         )
 
     def clean(self):
@@ -86,7 +82,6 @@ class RegistrationForm(MembershipForm):
         """Metadata to localize and customize the ModelForm."""
         model = auth.get_user_model()
         fields = ('first_name', 'last_name', 'username', 'email',
-                  'username', 'gender', 'first_name', 'last_name', 'email',
                   'avatar',
                   'membership', 'birthday', 'telephone',
                   'street_name',
diff --git a/src/membership/templates/membership/membership_form.html b/src/membership/templates/membership/membership_form.html
index b075c71..ab3a7e8 100644
--- a/src/membership/templates/membership/membership_form.html
+++ b/src/membership/templates/membership/membership_form.html
@@ -17,18 +17,21 @@
 </p>
 </fieldset>
 </form>
-{% endblock %}
+<script type="text/javascript">
+function togglePersonalData(event) {
+    var membership = document.getElementById("id_membership").checked;
+    var input_elements = ["id_first_name", "id_last_name", "id_birthday"];
+    for (var i = 0; i < input_elements.length; i++) {
+      element_id = input_elements[i]
+      element = document.getElementById(element_id);
+      element.disabled = !membership;
+      if (membership == 0) {element.value = ""};
+    };
+};
 
-{% block javascript %}
-$(function() {
-    $( "#id_birthday" ).datepicker({
-      changeMonth: true,
-      changeYear: true,
-      dateFormat: 'yy-mm-dd',
-      yearRange: '-50,0',
-      firstDay: 1
-    });
-  });
+document.addEventListener('DOMContentLoaded',function() {document.querySelector('#id_membership').onchange=togglePersonalData;},false);
+togglePersonalData();
+</script>
 {% endblock %}
 
 {% block buttonbar %}{% endblock %}
diff --git a/src/membership/templates/membership/register_form.html b/src/membership/templates/membership/register_form.html
index bbda764..904654f 100644
--- a/src/membership/templates/membership/register_form.html
+++ b/src/membership/templates/membership/register_form.html
@@ -14,7 +14,7 @@
 
   <fieldset class="grid_5">
     <legend>{% trans "Club membership"%}</legend>
-    {% get_fieldset "membership, first_name, last_name, gender, birthday, street_name, post_code, city, telephone" from form as form2 %}
+    {% get_fieldset "membership, first_name, last_name, birthday" from form as form2 %}
     {% with form2 as form %}{% include "form.html" %}{% endwith %}
   </fieldset>
 
@@ -33,11 +33,12 @@
 <script type="text/javascript">
 function togglePersonalData(event) {
     var membership = document.getElementById("id_membership").checked;
-    var input_elements = ["id_first_name", "id_last_name", "id_gender", "id_birthday", "id_street_name", "id_post_code", "id_city", "id_telephone"];
+    var input_elements = ["id_first_name", "id_last_name", "id_birthday"];
     for (var i = 0; i < input_elements.length; i++) {
       element_id = input_elements[i]
       element = document.getElementById(element_id);
       element.disabled = !membership;
+      if (membership == 0) {element.value = ""};
     };
 };