diff --git a/donate/static/donate/assets/js/scripts.js b/donate/static/donate/assets/js/scripts.js
index 050452027e9f1c34316d22e9c32f748462347b82..b6c48f58d60d43b28e899e8cbffc3571fdc9bc98 100644
--- a/donate/static/donate/assets/js/scripts.js
+++ b/donate/static/donate/assets/js/scripts.js
@@ -50,13 +50,26 @@
   });
 
 
-// Donate forn
+/* DONATE FORM */
+
+// On amount radio change
 $("input[name='amount']").change(function() {
+
+  // If custom amount is selected
   if($(this).attr('id') == 'amount4') {
+
+    // Show custom amount input and set it required
     $("#js-custom-amount-input").show(50);
+    $('#customamount').attr('required', true);
+
   } else {
+
+    // Hide custom amount and remove required field
     $("#js-custom-amount-input").hide(50);
+    $('#customamount').attr('required', false);
+
   }
 });
 
-$("input[name='amount']:checked").change(); // trigger correct state onload
+// Trigger correct state onload
+$("input[name='amount']:checked").change();
diff --git a/donate/templates/donate/base.html b/donate/templates/donate/base.html
index 99a1af082e3fd34d7a3e64f812b1034619905566..6b9ed8e3b5cf9fa82e0e5ab22a81741090fd0b3c 100644
--- a/donate/templates/donate/base.html
+++ b/donate/templates/donate/base.html
@@ -171,13 +171,13 @@
               <a href="{{ page.root_page.facebook }}" target="_blank"  rel="noreferrer"><i class="icon-facebook-f" title="Facebooková stránka"></i></a>
               {% endif %}
               {% if page.root_page.twitter %}
-              <a href="{{ page.root_page.twitter }}" target="_blank" rel="noreferrer">><i class="icon-twitter" title="Profil na Twitteru"></i></a>
+              <a href="{{ page.root_page.twitter }}" target="_blank" rel="noreferrer"><i class="icon-twitter" title="Profil na Twitteru"></i></a>
               {% endif %}
               {% if page.root_page.instagram %}
-              <a href="{{ page.root_page.instagram }}" target="_blank" rel="noreferrer">><i class="icon-instagram" title="Profil na Instagramu"></i></a>
+              <a href="{{ page.root_page.instagram }}" target="_blank" rel="noreferrer"><i class="icon-instagram" title="Profil na Instagramu"></i></a>
               {% endif %}
               {% if page.root_page.flickr %}
-              <a href="{{ page.root_page.flickr }}" target="_blank" rel="noreferrer">><i class="icon-flickr" title="Profil na Flickr"></i></a>
+              <a href="{{ page.root_page.flickr }}" target="_blank" rel="noreferrer"><i class="icon-flickr" title="Profil na Flickr"></i></a>
               {% endif %}
             </div>
           </div><!-- /column -->
diff --git a/donate/templates/donate/donate_home_page.html b/donate/templates/donate/donate_home_page.html
index c8a3247a178917df5b3eb8b3053f12697d33cf60..805f00bb90f15aff947efae791a3c0dc0bd62dac 100644
--- a/donate/templates/donate/donate_home_page.html
+++ b/donate/templates/donate/donate_home_page.html
@@ -57,7 +57,7 @@
               <legend class="col-form-label col-md-4 col-form-label-lg">Částka</legend>
               <div class="col-md-8">
                   <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="amount1" name="amount" value="100" class="custom-control-input" checked>
+                    <input type="radio" id="amount1" name="amount" value="100" class="custom-control-input" checked required>
                     <label class="custom-control-label col-form-label-lg" for="amount1">100 Kč</label>
                   </div>
                   <div class="custom-control custom-radio custom-control-inline">
@@ -77,7 +77,7 @@
           <div class="form-group row mb-4 align-items-center" id="js-custom-amount-input" style="display: none;">
               <div class="offset-md-4 col-md-8">
                 <div class="input-group input-group-lg mb-3 custom-amount">
-                  <input type="text" class="form-control" id="customamount" name="customamount" placeholder="1000" aria-describedby="customamount-currency">
+                  <input type="number" class="form-control" id="customamount" name="customamount" placeholder="1000" aria-describedby="customamount-currency">
                   <div class="input-group-append">
                     <span class="input-group-text" id="customamount-currency">Kč</span>
                   </div>
@@ -88,7 +88,7 @@
               <legend class="col-form-label col-md-4 col-form-label-lg">Typ příspěvku</legend>
               <div class="col-md-8">
                   <div class="custom-control custom-radio custom-control-inline">
-                    <input type="radio" id="type1" name="type" value="monthly" class="custom-control-input" checked>
+                    <input type="radio" id="type1" name="type" value="monthly" class="custom-control-input" checked required>
                     <label class="custom-control-label col-form-label-lg" for="type1">Měsíční</label>
                   </div>
                   <div class="custom-control custom-radio custom-control-inline">
diff --git a/donate/templates/donate/donate_project_page.html b/donate/templates/donate/donate_project_page.html
index 38287af1193045732b7b79d153f750c55ec28ec6..688d611a4d4fa2081efa05673cbb00172da42d66 100644
--- a/donate/templates/donate/donate_project_page.html
+++ b/donate/templates/donate/donate_project_page.html
@@ -100,7 +100,7 @@
                   <div class="form-group row mb-2 align-items-center" id="js-custom-amount-input" style="display: none;">
                       <div class="col-md-12">
                         <div class="input-group input-group-lg mb-3 custom-amount">
-                          <input type="text" class="form-control" id="customamount" name="customamount" placeholder="1000" aria-describedby="customamount-currency">
+                          <input type="number" class="form-control" id="customamount" name="customamount" placeholder="1000" aria-describedby="customamount-currency">
                           <div class="input-group-append">
                             <span class="input-group-text" id="customamount-currency">Kč</span>
                           </div>
diff --git a/donate/templates/donate/donate_region_page.html b/donate/templates/donate/donate_region_page.html
index e27d73f7cfd8e6c5d2f56b6d01fe867a0b3c5872..3f5820290afef062354e5bea5d13f2446d3b5a31 100644
--- a/donate/templates/donate/donate_region_page.html
+++ b/donate/templates/donate/donate_region_page.html
@@ -60,7 +60,7 @@
                 <div class="form-group row mb-2 align-items-center" id="js-custom-amount-input" style="display: none;">
                   <div class="col-md-12">
                     <div class="input-group input-group-lg mb-3 custom-amount">
-                      <input type="text" class="form-control" id="customamount" name="customamount" placeholder="1000" aria-describedby="customamount-currency">
+                      <input type="number" class="form-control" id="customamount" name="customamount" placeholder="1000" aria-describedby="customamount-currency">
                       <div class="input-group-append">
                         <span class="input-group-text" id="customamount-currency">Kč</span>
                       </div>