diff --git a/templates/people/gymnasts/create.html b/templates/people/gymnasts/create.html
index c081dab4b0..cca8bac59a 100644
--- a/templates/people/gymnasts/create.html
+++ b/templates/people/gymnasts/create.html
@@ -61,11 +61,17 @@
                             {% if form.trainings_by_week.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.trainings_by_week.errors %}{{error}}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
-                    <div class="form-group row {% if form.hours_by_week.errors %}has-error has-feedback{% endif %}">
+                    <div class="row">
                         <label for="id_hours_by_week" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-3 col-form-label">Hours by week <span class="text-danger"><b>*</b></span></label>
-                        <div class="col-8 col-sm-3 col-md-3 col-lg-2 col-xl-2">
+                        <div class="col-8 col-sm-3 col-md-3 col-lg-3 col-xl-3">
+                            <div class="form-group {% if form.hours_by_week.errors %}has-error{% endif %}">
                             {{ form.hours_by_week }}
-                            {% if form.hours_by_week.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.hours_by_week.errors %}{{error}}{% endfor %}</span>{% endif %}
+                            {% if form.hours_by_week.errors %}
+                                <label id="id_hours_by_week-error" class="text-danger" for="id_hours_by_week">
+                                    {% for error in form.hours_by_week.errors %}{{error}}{% endfor %}
+                                </label>
+                            {% endif %}
+                            </div>
                         </div>
                     </div>
                     <div class="form-group row ">
diff --git a/ultron/followup/views.py b/ultron/followup/views.py
index 21d248a76e..5b89724bd9 100644
--- a/ultron/followup/views.py
+++ b/ultron/followup/views.py
@@ -185,10 +185,9 @@ def chrono_create_or_update(request, chrono_id=None, gymnast_id=None):
             new_chrono.save()
             return HttpResponseRedirect(reverse("gymnast_details", args=(new_chrono.gymnast.id,)))
         else:
-            print(form.errors)
-    else:  
-        form = ChronoForm(instance=chrono, initial=data)
+            return render(request, "followup/chronos/create.html", {'form': form})
 
+    form = ChronoForm(instance=chrono, initial=data)
     context = {"form": form, "chrono_id": chrono_id}
     return render(request, "followup/chronos/create.html", context)
 
@@ -244,10 +243,10 @@ def learnedskill_create_or_update(request, gymnast_id=None):
             return HttpResponseRedirect(
                 reverse("gymnast_details", args=(form.cleaned_data["gymnast"].id,))
             )
+        else:
+            render(request, "followup/learnedskills/create.html", {"form": form})
 
-    else:
-        form = LearnedSkillForm(initial=data)
-
+    form = LearnedSkillForm(initial=data)
     context = {"form": form, "gymnast_id": gymnast_id}
     return render(request, "followup/learnedskills/create.html", context)
 
@@ -295,10 +294,10 @@ def score_create_or_update(request, score_id=None, gymnast_id=None):
                     args=(form.cleaned_data["gymnast"].id,)
                 )
             )
+        else:
+            render(request, "followup/scores/create.html", {"form": form})
 
-    else:
-        form = ScoreForm(instance=score, initial=data)
-
+    form = ScoreForm(instance=score, initial=data)
     context = {"form": form, "score_id": score_id}
     return render(request, "followup/scores/create.html", context)
 
@@ -373,10 +372,10 @@ def accident_create_or_update(request, accident_id=None, gymnast_id=None):
         if form.is_valid():
             accident = form.save()
             return HttpResponseRedirect(reverse("accident_details", args=(accident.pk,)))
+        else:
+            return render(request, "followup/accidents/create.html", {"form": form})
 
-    else:
-        form = AccidentForm(instance=accident, initial=data)
-
+    form = AccidentForm(instance=accident, initial=data)
     context = {"form": form, "accident_id": accident_id}
     return render(request, "followup/accidents/create.html", context)
 
@@ -437,10 +436,10 @@ def mindstate_create_or_update(
         if form.is_valid():
             mindstate = form.save()
             return HttpResponseRedirect(reverse("mindstate_details", args=(mindstate.pk,)))
+        else:
+            return render(request, "followup/mindstates/create.html", {"form": form})
 
-    else:
-        form = MindStateForm(instance=mindstate, initial=data)
-
+    form = MindStateForm(instance=mindstate, initial=data)
     context = {"form": form, "mindstate_id": mindstate_id}
     return render(request, "followup/mindstates/create.html", context)
 
@@ -503,9 +502,10 @@ def heightweight_create_or_update(request, heightweight_id=None, gymnast_id=None
             return HttpResponseRedirect(
                 reverse("gymnast_details", args=(form.cleaned_data["gymnast"].id,))
             )
-    else:
-        form = HeightWeightForm(instance=heightweight, initial=data)
-
+        else:
+            return render(request, "followup/heightweight/create.html", {"form": form})
+    
+    form = HeightWeightForm(instance=heightweight, initial=data)
     context = {
         "form": form,
         "gymnast_id": gymnast_id,
@@ -589,10 +589,11 @@ def routinedone_create_or_update(request, routinedone_id=None, gymnast_id=None):
             return HttpResponseRedirect(
                 reverse("gymnast_details", args=(form.cleaned_data["gymnast"].id,))
             )
+        else:
+            return render(request, "followup/routinedone/create.html", {"form": form})
 
-    else:
-        form = NumberOfRoutineDoneForm(instance=routinedone, initial=data)
 
+    form = NumberOfRoutineDoneForm(instance=routinedone, initial=data)
     context = {"form": form, "routinedone_id": routinedone_id}
     return render(request, "followup/routinedone/create.html", context)
 
@@ -638,9 +639,9 @@ def plan_create_or_update(request, plan_id=None, gymnast_id=None, skill_id=None)
             return HttpResponseRedirect(
                 reverse("gymnast_details", args=(form.cleaned_data["gymnast"].id,))
             )
+        else:
+            return render(request, "followup/plan/create.html", {"form": form})
 
-    else:
-        form = PlanForm(instance=plan, initial=data)
-
+    form = PlanForm(instance=plan, initial=data)
     context = {"form": form, "plan_id": plan_id}
     return render(request, "followup/plan/create.html", context)
diff --git a/ultron/location/views.py b/ultron/location/views.py
index adc304ac64..75ab44cd57 100644
--- a/ultron/location/views.py
+++ b/ultron/location/views.py
@@ -89,10 +89,11 @@ def place_create_or_update(request, place_id=None):
         if form.is_valid():
             place = form.save()
             return HttpResponseRedirect(reverse("place_details", args=(place.pk,)))
+        else:
+            return render(request, "locations/places/create.html", {"form": form})
 
-    else:
-        form = PlaceForm(instance=place, initial=data)
 
+    form = PlaceForm(instance=place, initial=data)
     context = {"form": form, "place_id": place_id}
     return render(request, "locations/places/create.html", context)
 
diff --git a/ultron/objective/views.py b/ultron/objective/views.py
index eab64be657..c475af95eb 100644
--- a/ultron/objective/views.py
+++ b/ultron/objective/views.py
@@ -222,9 +222,10 @@ def routine_create_or_update(request, routine_id=None):
             # something like this : http://stackoverflow.com/questions/3074938/django-m2m-form-save-through-table  # pylint: disable=line-too-long
             # TO_FRED : can you help me ?
             return HttpResponseRedirect(reverse("routine_details", args=(routine.pk,)))
-    else:
-        form = RoutineForm(instance=routine)
+        else:
+            return render(request, "objectives/routines/create.html", {"form": form})
 
+    form = RoutineForm(instance=routine)
     context = {"form": form, "routine_id": routine_id}
     return render(request, "objectives/routines/create.html", context)
 
diff --git a/ultron/people/views.py b/ultron/people/views.py
index 689f348155..5b524829cb 100644
--- a/ultron/people/views.py
+++ b/ultron/people/views.py
@@ -299,9 +299,10 @@ def gymnast_create_or_update(request, gymnast_id=None):
                 #     user.set_password(gymnast.last_name.lower() + _ + str(gymnast.birthdate)[-2:])
             
             return HttpResponseRedirect(reverse("gymnast_details", args=(gymnast.pk,)))
+        else:
+            return render(request, "people/gymnasts/create.html", {'form':gymnast_form})
 
     form = GymnastForm(instance=gymnast, initial=data)
-
     context = {"form": form, "gymnast_id": gymnast_id}
     return render(request, "people/gymnasts/create.html", context)
 
diff --git a/ultron/planning/views.py b/ultron/planning/views.py
index 7a90329983..3f4b16efdb 100644
--- a/ultron/planning/views.py
+++ b/ultron/planning/views.py
@@ -46,11 +46,13 @@ def event_create_or_update(request, event_id=None):
         data = {}
 
     if request.method == "POST":
-        event_form = EventForm(request.POST, instance=event)
+        form = EventForm(request.POST, instance=event)
 
-        if event_form.is_valid():
-            event = event_form.save()
+        if form.is_valid():
+            event = form.save()
             return HttpResponseRedirect(reverse("event_details", args=(event.pk,)))
+        else:
+            return render(request, "objectives/routines/create.html", {"form": form})
 
     form = EventForm(instance=event, initial=data)
     context = {"form": form, "event_id": event_id}