diff --git a/public/js/app.js b/public/js/app.js
index 6e6f0f2a..fdbb3657 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -207,7 +207,7 @@ eval("$(document).ready(function(){var fileInputCommonConfig={previewTemplates:{
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("$(document).ready(function(){$('.open-button').on('click',function(e){e.preventDefault();var container=$('#contact-form-container');$.ajax({type:'GET',url:'/contact/form'}).done(function(response){container.replaceWith(response);document.getElementById('contact-form-yb-frontend').style.display='block'}).fail(function(jqXHR){switch(jqXHR.status){default:window.toastr.error(translateText('Something went wrong! Please try again!'));break;}})});$('.cancel').on('click',function(){document.getElementById('contact-form-yb-frontend').style.display='none'});$('#send-expert-contact-form').on('click',function(e){e.preventDefault();var form=$('#contact_form');$.ajax({type:'POST',url:'/contact/save-contact-message',data:$(form).serialize()}).done(function(response){if(response.message.type==='success'){$('input[name=\"email\"]').val('');$('input[name=\"name\"]').val('');$('textarea[name=\"message\"]').val('');document.getElementById('contact-form-yb-frontend').style.display='none';window.toastr.success(translateText(response.message.text))}else{window.toastr.error(translateText(response.message.text))}}).fail(function(jqXHR){switch(jqXHR.status){case 422:var responseText=JSON.parse(translateText(jqXHR.responseText));window.toastr.error(responseText);break;case 401:var data=JSON.parse(translateText(jqXHR.responseText));redirectTo(data.redirect);break;default:window.toastr.error(translateText('Unexpected error. Please try again!'));break;}})})});function validateContactUsForm(){event.preventDefault();$('.contactUsFormErrors').hide();var submit=true;if($('#contact_form #name').val()==''){submit=false;$('#contactUsErrors').show();$('#contactUsEmptyName').show()}if($('#contact_form #email').val()==''){submit=false;$('#contactUsErrors').show();$('#contactUsEmptyEmail').show()}if($('#contact_form #message').val()==''){submit=false;$('#contactUsErrors').show();$('#contactUsEmptyText').show()}if(submit==true){grecaptcha.execute()}}window.validateContactUsForm=validateContactUsForm;function submitContactUsForm(){$('#contact_form').submit()}window.submitContactUsForm=submitContactUsForm;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiLi9BcHAvYXNzZXRzL2pzL2NvbXBvbmVudHMvX2NvbnRhY3QuanMuanMiLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vc3JjL0FwcC9hc3NldHMvanMvY29tcG9uZW50cy9fY29udGFjdC5qcz85OTQ2Il0sInNvdXJjZXNDb250ZW50IjpbIiQoZG9jdW1lbnQpLnJlYWR5KGZ1bmN0aW9uICgpIHtcclxuICAgICQoJy5vcGVuLWJ1dHRvbicpLm9uKCdjbGljaycsIGZ1bmN0aW9uIChlKSB7XHJcbiAgICAgICAgZS5wcmV2ZW50RGVmYXVsdCgpO1xyXG4gICAgICAgIGxldCBjb250YWluZXIgPSAkKCcjY29udGFjdC1mb3JtLWNvbnRhaW5lcicpO1xyXG5cclxuICAgICAgICAkLmFqYXgoe1xyXG4gICAgICAgICAgICB0eXBlOiAnR0VUJyxcclxuICAgICAgICAgICAgdXJsOiAnL2NvbnRhY3QvZm9ybScsXHJcbiAgICAgICAgfSkuZG9uZShmdW5jdGlvbiAocmVzcG9uc2UpIHtcclxuICAgICAgICAgICAgY29udGFpbmVyLnJlcGxhY2VXaXRoKHJlc3BvbnNlKTtcclxuICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoXCJjb250YWN0LWZvcm0teWItZnJvbnRlbmRcIikuc3R5bGUuZGlzcGxheSA9IFwiYmxvY2tcIjtcclxuICAgICAgICB9KS5mYWlsKGZ1bmN0aW9uIChqcVhIUikge1xyXG4gICAgICAgICAgICBzd2l0Y2ggKGpxWEhSLnN0YXR1cykge1xyXG4gICAgICAgICAgICAgICAgZGVmYXVsdDpcclxuICAgICAgICAgICAgICAgICAgICB3aW5kb3cudG9hc3RyLmVycm9yKHRyYW5zbGF0ZVRleHQoJ1NvbWV0aGluZyB3ZW50IHdyb25nISBQbGVhc2UgdHJ5IGFnYWluIScpKTtcclxuICAgICAgICAgICAgICAgICAgICBicmVhaztcclxuICAgICAgICAgICAgfVxyXG4gICAgICAgIH0pO1xyXG4gICAgfSk7XHJcbiAgICAkKCcuY2FuY2VsJykub24oJ2NsaWNrJywgZnVuY3Rpb24gKCkge1xyXG4gICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKFwiY29udGFjdC1mb3JtLXliLWZyb250ZW5kXCIpLnN0eWxlLmRpc3BsYXkgPSBcIm5vbmVcIjtcclxuICAgIH0pO1xyXG5cclxuICAgICQoJyNzZW5kLWV4cGVydC1jb250YWN0LWZvcm0nKS5vbignY2xpY2snLCBmdW5jdGlvbiAoZSkge1xyXG4gICAgICAgIGUucHJldmVudERlZmF1bHQoKTtcclxuICAgICAgICBsZXQgZm9ybSA9ICQoJyNjb250YWN0X2Zvcm0nKTtcclxuXHJcbiAgICAgICAgJC5hamF4KHtcclxuICAgICAgICAgICAgdHlwZTogXCJQT1NUXCIsXHJcbiAgICAgICAgICAgIHVybDogJy9jb250YWN0L3NhdmUtY29udGFjdC1tZXNzYWdlJyxcclxuICAgICAgICAgICAgZGF0YTogJChmb3JtKS5zZXJpYWxpemUoKVxyXG4gICAgICAgIH0pLmRvbmUoZnVuY3Rpb24gKHJlc3BvbnNlKSB7XHJcbiAgICAgICAgICAgIGlmIChyZXNwb25zZS5tZXNzYWdlLnR5cGUgPT09ICdzdWNjZXNzJykge1xyXG4gICAgICAgICAgICAgICAgJCgnaW5wdXRbbmFtZT1cImVtYWlsXCJdJykudmFsKCcnKTtcclxuICAgICAgICAgICAgICAgICQoJ2lucHV0W25hbWU9XCJuYW1lXCJdJykudmFsKCcnKTtcclxuICAgICAgICAgICAgICAgICQoJ3RleHRhcmVhW25hbWU9XCJtZXNzYWdlXCJdJykudmFsKCcnKTtcclxuICAgICAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKFwiY29udGFjdC1mb3JtLXliLWZyb250ZW5kXCIpLnN0eWxlLmRpc3BsYXkgPSBcIm5vbmVcIjtcclxuICAgICAgICAgICAgICAgIHdpbmRvdy50b2FzdHIuc3VjY2Vzcyh0cmFuc2xhdGVUZXh0KHJlc3BvbnNlLm1lc3NhZ2UudGV4dCkpO1xyXG4gICAgICAgICAgICB9IGVsc2Uge1xyXG4gICAgICAgICAgICAgICAgd2luZG93LnRvYXN0ci5lcnJvcih0cmFuc2xhdGVUZXh0KHJlc3BvbnNlLm1lc3NhZ2UudGV4dCkpO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgfSkuZmFpbChmdW5jdGlvbiAoanFYSFIpIHtcclxuICAgICAgICAgICAgc3dpdGNoIChqcVhIUi5zdGF0dXMpIHtcclxuICAgICAgICAgICAgICAgIGNhc2UgNDIyOlxyXG4gICAgICAgICAgICAgICAgICAgIGxldCByZXNwb25zZVRleHQgPSBKU09OLnBhcnNlKHRyYW5zbGF0ZVRleHQoanFYSFIucmVzcG9uc2VUZXh0KSk7XHJcbiAgICAgICAgICAgICAgICAgICAgd2luZG93LnRvYXN0ci5lcnJvcihyZXNwb25zZVRleHQpO1xyXG4gICAgICAgICAgICAgICAgICAgIGJyZWFrO1xyXG5cclxuICAgICAgICAgICAgICAgIGNhc2UgNDAxOlxyXG4gICAgICAgICAgICAgICAgICAgIGxldCBkYXRhID0gSlNPTi5wYXJzZSh0cmFuc2xhdGVUZXh0KGpxWEhSLnJlc3BvbnNlVGV4dCkpO1xyXG4gICAgICAgICAgICAgICAgICAgIHJlZGlyZWN0VG8oZGF0YS5yZWRpcmVjdCk7XHJcbiAgICAgICAgICAgICAgICAgICAgYnJlYWs7XHJcblxyXG4gICAgICAgICAgICAgICAgZGVmYXVsdDpcclxuICAgICAgICAgICAgICAgICAgICB3aW5kb3cudG9hc3RyLmVycm9yKHRyYW5zbGF0ZVRleHQoXCJVbmV4cGVjdGVkIGVycm9yLiBQbGVhc2UgdHJ5IGFnYWluIVwiKSk7XHJcbiAgICAgICAgICAgICAgICAgICAgYnJlYWs7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICB9KTtcclxuICAgIH0pO1xyXG59KTtcclxuXHJcbmZ1bmN0aW9uIHZhbGlkYXRlQ29udGFjdFVzRm9ybSgpXHJcbntcclxuICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7XHJcbiAgICAkKCcuY29udGFjdFVzRm9ybUVycm9ycycpLmhpZGUoKTtcclxuICAgIHZhciBzdWJtaXQgPSB0cnVlO1xyXG4gICAgaWYgKCQoJyNjb250YWN0X2Zvcm0gI25hbWUnKS52YWwoKSA9PSAnJykge1xyXG4gICAgICAgIHN1Ym1pdCA9IGZhbHNlO1xyXG4gICAgICAgICQoJyNjb250YWN0VXNFcnJvcnMnKS5zaG93KCk7XHJcbiAgICAgICAgJCgnI2NvbnRhY3RVc0VtcHR5TmFtZScpLnNob3coKTtcclxuICAgIH1cclxuICAgIGlmICgkKCcjY29udGFjdF9mb3JtICNlbWFpbCcpLnZhbCgpID09ICcnKSB7XHJcbiAgICAgICAgc3VibWl0ID0gZmFsc2U7XHJcbiAgICAgICAgJCgnI2NvbnRhY3RVc0Vycm9ycycpLnNob3coKTtcclxuICAgICAgICAkKCcjY29udGFjdFVzRW1wdHlFbWFpbCcpLnNob3coKTtcclxuICAgIH1cclxuICAgIGlmICgkKCcjY29udGFjdF9mb3JtICNtZXNzYWdlJykudmFsKCkgPT0gJycpIHtcclxuICAgICAgICBzdWJtaXQgPSBmYWxzZTtcclxuICAgICAgICAkKCcjY29udGFjdFVzRXJyb3JzJykuc2hvdygpO1xyXG4gICAgICAgICQoJyNjb250YWN0VXNFbXB0eVRleHQnKS5zaG93KCk7XHJcbiAgICB9XHJcbiAgICBpZiAoc3VibWl0ID09IHRydWUpIHtcclxuICAgICAgICBncmVjYXB0Y2hhLmV4ZWN1dGUoKTtcclxuICAgIH1cclxufVxyXG53aW5kb3cudmFsaWRhdGVDb250YWN0VXNGb3JtID0gdmFsaWRhdGVDb250YWN0VXNGb3JtO1xyXG5cclxuZnVuY3Rpb24gc3VibWl0Q29udGFjdFVzRm9ybSgpXHJcbntcclxuICAgICQoJyNjb250YWN0X2Zvcm0nKS5zdWJtaXQoKTtcclxufVxyXG53aW5kb3cuc3VibWl0Q29udGFjdFVzRm9ybSA9IHN1Ym1pdENvbnRhY3RVc0Zvcm07XHJcbiJdLCJtYXBwaW5ncyI6IkFBQUEiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///./App/assets/js/components/_contact.js\n");
+eval("$(document).ready(function(){$('.open-button').on('click',function(e){e.preventDefault();var container=$('#contact-form-container');$.ajax({type:'GET',url:'/contact/form'}).done(function(response){container.replaceWith(response);document.getElementById('contact-form-yb-frontend').style.display='block'}).fail(function(jqXHR){switch(jqXHR.status){default:window.toastr.error(translateText('Something went wrong! Please try again!'));break;}})});$('.cancel').on('click',function(){document.getElementById('contact-form-yb-frontend').style.display='none'});$('#send-expert-contact-form').on('click',function(e){e.preventDefault();var form=$('#contact_form');$.ajax({type:'POST',url:'/contact/save-contact-message',data:$(form).serialize()}).done(function(response){if(response.message.type==='success'){$('input[name=\"email\"]').val('');$('input[name=\"name\"]').val('');$('textarea[name=\"message\"]').val('');document.getElementById('contact-form-yb-frontend').style.display='none';window.toastr.success(translateText(response.message.text))}else{window.toastr.error(translateText(response.message.text))}}).fail(function(jqXHR){switch(jqXHR.status){case 422:var responseText=JSON.parse(translateText(jqXHR.responseText));window.toastr.error(responseText);break;case 401:var data=JSON.parse(translateText(jqXHR.responseText));redirectTo(data.redirect);break;default:window.toastr.error(translateText('Unexpected error. Please try again!'));break;}})})});function validateContactUsForm(){event.preventDefault();$('.contactUsFormErrors').hide();var submit=true;if(!$('.g-recaptcha')[0].dataset.sitekey){submit=false;$('#contactUsErrors').show();$('#recaptchaSiteKeyEmpty').show();return false}if($('#contact_form #name').val()==''){submit=false;$('#contactUsErrors').show();$('#contactUsEmptyName').show()}if($('#contact_form #email').val()==''){submit=false;$('#contactUsErrors').show();$('#contactUsEmptyEmail').show()}if($('#contact_form #message').val()==''){submit=false;$('#contactUsErrors').show();$('#contactUsEmptyText').show()}if(submit==true){grecaptcha.execute()}}window.validateContactUsForm=validateContactUsForm;function submitContactUsForm(){$('#contact_form').submit()}window.submitContactUsForm=submitContactUsForm;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiLi9BcHAvYXNzZXRzL2pzL2NvbXBvbmVudHMvX2NvbnRhY3QuanMuanMiLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vc3JjL0FwcC9hc3NldHMvanMvY29tcG9uZW50cy9fY29udGFjdC5qcz85OTQ2Il0sInNvdXJjZXNDb250ZW50IjpbIiQoZG9jdW1lbnQpLnJlYWR5KGZ1bmN0aW9uICgpIHtcclxuICAgICQoJy5vcGVuLWJ1dHRvbicpLm9uKCdjbGljaycsIGZ1bmN0aW9uIChlKSB7XHJcbiAgICAgICAgZS5wcmV2ZW50RGVmYXVsdCgpO1xyXG4gICAgICAgIGxldCBjb250YWluZXIgPSAkKCcjY29udGFjdC1mb3JtLWNvbnRhaW5lcicpO1xyXG5cclxuICAgICAgICAkLmFqYXgoe1xyXG4gICAgICAgICAgICB0eXBlOiAnR0VUJyxcclxuICAgICAgICAgICAgdXJsOiAnL2NvbnRhY3QvZm9ybScsXHJcbiAgICAgICAgfSkuZG9uZShmdW5jdGlvbiAocmVzcG9uc2UpIHtcclxuICAgICAgICAgICAgY29udGFpbmVyLnJlcGxhY2VXaXRoKHJlc3BvbnNlKTtcclxuICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoXCJjb250YWN0LWZvcm0teWItZnJvbnRlbmRcIikuc3R5bGUuZGlzcGxheSA9IFwiYmxvY2tcIjtcclxuICAgICAgICB9KS5mYWlsKGZ1bmN0aW9uIChqcVhIUikge1xyXG4gICAgICAgICAgICBzd2l0Y2ggKGpxWEhSLnN0YXR1cykge1xyXG4gICAgICAgICAgICAgICAgZGVmYXVsdDpcclxuICAgICAgICAgICAgICAgICAgICB3aW5kb3cudG9hc3RyLmVycm9yKHRyYW5zbGF0ZVRleHQoJ1NvbWV0aGluZyB3ZW50IHdyb25nISBQbGVhc2UgdHJ5IGFnYWluIScpKTtcclxuICAgICAgICAgICAgICAgICAgICBicmVhaztcclxuICAgICAgICAgICAgfVxyXG4gICAgICAgIH0pO1xyXG4gICAgfSk7XHJcbiAgICAkKCcuY2FuY2VsJykub24oJ2NsaWNrJywgZnVuY3Rpb24gKCkge1xyXG4gICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKFwiY29udGFjdC1mb3JtLXliLWZyb250ZW5kXCIpLnN0eWxlLmRpc3BsYXkgPSBcIm5vbmVcIjtcclxuICAgIH0pO1xyXG5cclxuICAgICQoJyNzZW5kLWV4cGVydC1jb250YWN0LWZvcm0nKS5vbignY2xpY2snLCBmdW5jdGlvbiAoZSkge1xyXG4gICAgICAgIGUucHJldmVudERlZmF1bHQoKTtcclxuICAgICAgICBsZXQgZm9ybSA9ICQoJyNjb250YWN0X2Zvcm0nKTtcclxuXHJcbiAgICAgICAgJC5hamF4KHtcclxuICAgICAgICAgICAgdHlwZTogXCJQT1NUXCIsXHJcbiAgICAgICAgICAgIHVybDogJy9jb250YWN0L3NhdmUtY29udGFjdC1tZXNzYWdlJyxcclxuICAgICAgICAgICAgZGF0YTogJChmb3JtKS5zZXJpYWxpemUoKVxyXG4gICAgICAgIH0pLmRvbmUoZnVuY3Rpb24gKHJlc3BvbnNlKSB7XHJcbiAgICAgICAgICAgIGlmIChyZXNwb25zZS5tZXNzYWdlLnR5cGUgPT09ICdzdWNjZXNzJykge1xyXG4gICAgICAgICAgICAgICAgJCgnaW5wdXRbbmFtZT1cImVtYWlsXCJdJykudmFsKCcnKTtcclxuICAgICAgICAgICAgICAgICQoJ2lucHV0W25hbWU9XCJuYW1lXCJdJykudmFsKCcnKTtcclxuICAgICAgICAgICAgICAgICQoJ3RleHRhcmVhW25hbWU9XCJtZXNzYWdlXCJdJykudmFsKCcnKTtcclxuICAgICAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKFwiY29udGFjdC1mb3JtLXliLWZyb250ZW5kXCIpLnN0eWxlLmRpc3BsYXkgPSBcIm5vbmVcIjtcclxuICAgICAgICAgICAgICAgIHdpbmRvdy50b2FzdHIuc3VjY2Vzcyh0cmFuc2xhdGVUZXh0KHJlc3BvbnNlLm1lc3NhZ2UudGV4dCkpO1xyXG4gICAgICAgICAgICB9IGVsc2Uge1xyXG4gICAgICAgICAgICAgICAgd2luZG93LnRvYXN0ci5lcnJvcih0cmFuc2xhdGVUZXh0KHJlc3BvbnNlLm1lc3NhZ2UudGV4dCkpO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgfSkuZmFpbChmdW5jdGlvbiAoanFYSFIpIHtcclxuICAgICAgICAgICAgc3dpdGNoIChqcVhIUi5zdGF0dXMpIHtcclxuICAgICAgICAgICAgICAgIGNhc2UgNDIyOlxyXG4gICAgICAgICAgICAgICAgICAgIGxldCByZXNwb25zZVRleHQgPSBKU09OLnBhcnNlKHRyYW5zbGF0ZVRleHQoanFYSFIucmVzcG9uc2VUZXh0KSk7XHJcbiAgICAgICAgICAgICAgICAgICAgd2luZG93LnRvYXN0ci5lcnJvcihyZXNwb25zZVRleHQpO1xyXG4gICAgICAgICAgICAgICAgICAgIGJyZWFrO1xyXG5cclxuICAgICAgICAgICAgICAgIGNhc2UgNDAxOlxyXG4gICAgICAgICAgICAgICAgICAgIGxldCBkYXRhID0gSlNPTi5wYXJzZSh0cmFuc2xhdGVUZXh0KGpxWEhSLnJlc3BvbnNlVGV4dCkpO1xyXG4gICAgICAgICAgICAgICAgICAgIHJlZGlyZWN0VG8oZGF0YS5yZWRpcmVjdCk7XHJcbiAgICAgICAgICAgICAgICAgICAgYnJlYWs7XHJcblxyXG4gICAgICAgICAgICAgICAgZGVmYXVsdDpcclxuICAgICAgICAgICAgICAgICAgICB3aW5kb3cudG9hc3RyLmVycm9yKHRyYW5zbGF0ZVRleHQoXCJVbmV4cGVjdGVkIGVycm9yLiBQbGVhc2UgdHJ5IGFnYWluIVwiKSk7XHJcbiAgICAgICAgICAgICAgICAgICAgYnJlYWs7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICB9KTtcclxuICAgIH0pO1xyXG59KTtcclxuXHJcbmZ1bmN0aW9uIHZhbGlkYXRlQ29udGFjdFVzRm9ybSgpXHJcbntcclxuICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7XHJcbiAgICAkKCcuY29udGFjdFVzRm9ybUVycm9ycycpLmhpZGUoKTtcclxuICAgIHZhciBzdWJtaXQgPSB0cnVlO1xyXG4gICAgaWYgKCEkKCcuZy1yZWNhcHRjaGEnKVswXS5kYXRhc2V0LnNpdGVrZXkpIHtcclxuICAgICAgICBzdWJtaXQgPSBmYWxzZTtcclxuICAgICAgICAkKCcjY29udGFjdFVzRXJyb3JzJykuc2hvdygpO1xyXG4gICAgICAgICQoJyNyZWNhcHRjaGFTaXRlS2V5RW1wdHknKS5zaG93KCk7XHJcbiAgICAgICAgcmV0dXJuIGZhbHNlO1xyXG4gICAgfVxyXG4gICAgaWYgKCQoJyNjb250YWN0X2Zvcm0gI25hbWUnKS52YWwoKSA9PSAnJykge1xyXG4gICAgICAgIHN1Ym1pdCA9IGZhbHNlO1xyXG4gICAgICAgICQoJyNjb250YWN0VXNFcnJvcnMnKS5zaG93KCk7XHJcbiAgICAgICAgJCgnI2NvbnRhY3RVc0VtcHR5TmFtZScpLnNob3coKTtcclxuICAgIH1cclxuICAgIGlmICgkKCcjY29udGFjdF9mb3JtICNlbWFpbCcpLnZhbCgpID09ICcnKSB7XHJcbiAgICAgICAgc3VibWl0ID0gZmFsc2U7XHJcbiAgICAgICAgJCgnI2NvbnRhY3RVc0Vycm9ycycpLnNob3coKTtcclxuICAgICAgICAkKCcjY29udGFjdFVzRW1wdHlFbWFpbCcpLnNob3coKTtcclxuICAgIH1cclxuICAgIGlmICgkKCcjY29udGFjdF9mb3JtICNtZXNzYWdlJykudmFsKCkgPT0gJycpIHtcclxuICAgICAgICBzdWJtaXQgPSBmYWxzZTtcclxuICAgICAgICAkKCcjY29udGFjdFVzRXJyb3JzJykuc2hvdygpO1xyXG4gICAgICAgICQoJyNjb250YWN0VXNFbXB0eVRleHQnKS5zaG93KCk7XHJcbiAgICB9XHJcbiAgICBpZiAoc3VibWl0ID09IHRydWUpIHtcclxuICAgICAgICBncmVjYXB0Y2hhLmV4ZWN1dGUoKTtcclxuICAgIH1cclxufVxyXG53aW5kb3cudmFsaWRhdGVDb250YWN0VXNGb3JtID0gdmFsaWRhdGVDb250YWN0VXNGb3JtO1xyXG5cclxuZnVuY3Rpb24gc3VibWl0Q29udGFjdFVzRm9ybSgpXHJcbntcclxuICAgICQoJyNjb250YWN0X2Zvcm0nKS5zdWJtaXQoKTtcclxufVxyXG53aW5kb3cuc3VibWl0Q29udGFjdFVzRm9ybSA9IHN1Ym1pdENvbnRhY3RVc0Zvcm07XHJcbiJdLCJtYXBwaW5ncyI6IkFBQUEiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///./App/assets/js/components/_contact.js\n");
 
 /***/ }),
 
diff --git a/src/App/assets/js/components/_contact.js b/src/App/assets/js/components/_contact.js
index ff335e6c..06772759 100644
--- a/src/App/assets/js/components/_contact.js
+++ b/src/App/assets/js/components/_contact.js
@@ -64,6 +64,12 @@ function validateContactUsForm()
     event.preventDefault();
     $('.contactUsFormErrors').hide();
     var submit = true;
+    if (!$('.g-recaptcha')[0].dataset.sitekey) {
+        submit = false;
+        $('#contactUsErrors').show();
+        $('#recaptchaSiteKeyEmpty').show();
+        return false;
+    }
     if ($('#contact_form #name').val() == '') {
         submit = false;
         $('#contactUsErrors').show();
diff --git a/src/Contact/templates/contact/contact-form.html.twig b/src/Contact/templates/contact/contact-form.html.twig
index 5889cf59..990a50ef 100644
--- a/src/Contact/templates/contact/contact-form.html.twig
+++ b/src/Contact/templates/contact/contact-form.html.twig
@@ -14,11 +14,12 @@
                     <p>{% trans 'Any issues or good feedback?' %}<br /><br />{% trans 'Write us here and we will get in touch with you as soon as possible.' %}</p>
                     <hr />
                     {{ messagesPartial('partial::alerts') }}
-                    <div id="contactUsErrors" class="alert alert-danger contactUsFormErrors" role="alert" style="display:none">
+                    <div id="contactUsErrors" class="alert alert-danger contactUsFormErrors" role="alert" {% if recaptchaSiteKey != '' %}style="display:none"{% endif %}>
                         <ul>
                             <li id="contactUsEmptyName" class="contactUsFormErrors" style="display:none">Name is empty.</li>
                             <li id="contactUsEmptyEmail" class="contactUsFormErrors" style="display:none">E-mail is empty.</li>
                             <li id="contactUsEmptyText" class="contactUsFormErrors" style="display:none">Message is empty.</li>
+                            <li id="recaptchaSiteKeyEmpty" class="contactUsFormErrors" {% if recaptchaSiteKey != '' %}style="display:none"{% endif %}>reCAPTCHA is empty.</li>
                         </ul>
                     </div>