diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js
index ca14bf91..c0088ee7 100644
--- a/assets/js/um-scripts.js
+++ b/assets/js/um-scripts.js
@@ -116,14 +116,14 @@ jQuery(document).ready(function() {
 
 	jQuery('.um-s1,.um-s2').css({'display':'block'});
 
-	if( jQuery(".um-s1").length > 0 ){
-		jQuery(".um-s1").each(function () {
-			var select = jQuery(this);
-			if( select.val() === '' && select.attr('data-default') ) {
-				select.val(select.attr('data-default'));
-			}
-		});
-	}
+	// if( jQuery(".um-s1").length > 0 ){
+	// 	jQuery(".um-s1").each(function () {
+	// 		var select = jQuery(this);
+	// 		if( select.val() === '' && select.attr('data-default') ) {
+	// 			select.val(select.attr('data-default'));
+	// 		}
+	// 	});
+	// }
 
 	if( typeof(jQuery.fn.select2) === "function" ){
 		jQuery(".um-s1").select2({
diff --git a/assets/js/um-scripts.min.js b/assets/js/um-scripts.min.js
index 0c10f167..33cff12d 100644
--- a/assets/js/um-scripts.min.js
+++ b/assets/js/um-scripts.min.js
@@ -1 +1 @@
-function um_init_datetimepicker(){jQuery(".um-datepicker:not(.picker__input)").each(function(){if(elem=jQuery(this),void 0!==elem.attr("data-disabled_weekdays")&&""!=elem.attr("data-disabled_weekdays"))var e=JSON.parse(elem.attr("data-disabled_weekdays"));else e=!1;var t=null;void 0!==elem.attr("data-years")&&(t=elem.attr("data-years"));var a=elem.attr("data-date_min"),i=elem.attr("data-date_max"),r=[],n=[];void 0!==a&&(r=a.split(",")),void 0!==i&&(n=i.split(","));var u=r.length?new Date(r):null,s=r.length?new Date(n):null;if(u&&"Invalid Date"==u.toString()&&3==r.length){var o=r[1]+"/"+r[2]+"/"+r[0];u=new Date(Date.parse(o))}if(s&&"Invalid Date"==s.toString()&&3==n.length){var d=n[1]+"/"+n[2]+"/"+n[0];s=new Date(Date.parse(d))}var l={disable:e,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}};null!==t&&(l.selectYears=t),null!==u&&(l.min=u),null!==s&&(l.max=s),elem.pickadate(l)}),jQuery(".um-timepicker:not(.picker__input)").each(function(){elem=jQuery(this),elem.pickatime({format:elem.attr("data-format"),interval:parseInt(elem.attr("data-intervals")),formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})})}function init_tipsy(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy({gravity:"n",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-w").tipsy({gravity:"w",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-e").tipsy({gravity:"e",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-s").tipsy({gravity:"s",opacity:1,live:"a.live",offset:3}))}jQuery(document).ready(function(){jQuery(document.body).on("click",".um-dropdown a.real_url",function(e){window.location=jQuery(this).attr("href")}),jQuery(document.body).on("click",".um-trigger-menu-on-click",function(e){return jQuery(".um-dropdown").hide(),jQuery(this).find(".um-dropdown").show(),!1}),jQuery(document.body).on("click",".um-dropdown-hide",function(e){return UM_hide_menus(),!1}),jQuery(document.body).on("click","a.um-manual-trigger",function(){var e=jQuery(this).attr("data-child"),t=jQuery(this).attr("data-parent");return jQuery(this).parents(t).find(e).trigger("click"),UM_hide_menus(),!1}),jQuery(".um-s1,.um-s2").css({display:"block"}),0<jQuery(".um-s1").length&&jQuery(".um-s1").each(function(){var e=jQuery(this);""===e.val()&&e.attr("data-default")&&e.val(e.attr("data-default"))}),"function"==typeof jQuery.fn.select2&&(jQuery(".um-s1").select2({allowClear:!0}),jQuery(".um-s2").select2({allowClear:!1,minimumResultsForSearch:10}),jQuery(".um-s3").select2({allowClear:!1,minimumResultsForSearch:-1})),init_tipsy(),"function"==typeof jQuery.fn.um_raty&&(jQuery(".um-rating").um_raty({half:!1,starType:"i",number:function(){return jQuery(this).attr("data-number")},score:function(){return jQuery(this).attr("data-score")},scoreName:function(){return jQuery(this).attr("data-key")},hints:!1,click:function(e,t){live_field=this.id,live_value=e,um_apply_conditions(jQuery(this),!1)}}),jQuery(".um-rating-readonly").um_raty({half:!1,starType:"i",number:function(){return jQuery(this).attr("data-number")},score:function(){return jQuery(this).attr("data-score")},scoreName:function(){return jQuery(this).attr("data-key")},hints:!1,readOnly:!0})),jQuery(document).on("change",'.um-field-area input[type="radio"]',function(){var e=jQuery(this).parents(".um-field-area"),t=jQuery(this).parents("label");e.find(".um-field-radio").removeClass("active"),e.find(".um-field-radio").find("i").removeAttr("class").addClass("um-icon-android-radio-button-off"),t.addClass("active"),t.find("i").removeAttr("class").addClass("um-icon-android-radio-button-on")}),jQuery(document).on("change",'.um-field-area input[type="checkbox"]',function(){jQuery(this).parents(".um-field-area");var e=jQuery(this).parents("label");e.hasClass("active")?(e.removeClass("active"),e.find("i").removeAttr("class").addClass("um-icon-android-checkbox-outline-blank")):(e.addClass("active"),e.find("i").removeAttr("class").addClass("um-icon-android-checkbox-outline"))}),um_init_datetimepicker(),jQuery(document).on("click",".um .um-single-image-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-image-preview img").attr("src");return t.find(".um-single-image-preview img").attr("src",""),t.find(".um-single-image-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:a,nonce:um_scripts.nonce}}),!1}),jQuery(document).on("click",".um .um-single-file-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-fileinfo a").attr("href");return t.find(".um-single-file-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:a,nonce:um_scripts.nonce}}),!1}),jQuery(document).on("click",".um-field-group-head:not(.disabled)",function(){var e=jQuery(this).parents(".um-field-group"),t=e.data("max_entries");e.find(".um-field-group-body").is(":hidden")?e.find(".um-field-group-body").show():e.find(".um-field-group-body:first").clone().appendTo(e),increase_id=0,e.find(".um-field-group-body").each(function(){increase_id++,jQuery(this).find("input").each(function(){var e=jQuery(this);e.attr("id",e.data("key")+"-"+increase_id),e.attr("name",e.data("key")+"-"+increase_id),e.parent().parent().find("label").attr("for",e.data("key")+"-"+increase_id)})}),0<t&&e.find(".um-field-group-body").length==t&&jQuery(this).addClass("disabled")}),jQuery(document).on("click",".um-field-group-cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field-group"),a=t.data("max_entries");return 1<t.find(".um-field-group-body").length?jQuery(this).parents(".um-field-group-body").remove():jQuery(this).parents(".um-field-group-body").hide(),0<a&&t.find(".um-field-group-body").length<a&&t.find(".um-field-group-head").removeClass("disabled"),!1}),jQuery(document.body).on("click",".um-ajax-paginate",function(e){e.preventDefault();var t=jQuery(this),a=jQuery(this).parent();a.addClass("loading");var i=jQuery(this).data("hook");if("um_load_posts"===i){var r=1*jQuery(this).data("pages"),n=1*jQuery(this).data("page")+1;jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate_posts",author:jQuery(this).data("author"),page:n,nonce:um_scripts.nonce},complete:function(){a.removeClass("loading")},success:function(e){a.before(e),n===r?a.remove():t.data("page",n)}})}else if("um_load_comments"===i){r=1*jQuery(this).data("pages"),n=1*jQuery(this).data("page")+1;jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate_comments",user_id:jQuery(this).data("user_id"),page:n,nonce:um_scripts.nonce},complete:function(){a.removeClass("loading")},success:function(e){a.before(e),n===r?a.remove():t.data("page",n)}})}else{var u=jQuery(this).data("args"),s=jQuery(this).parents(".um").find(".um-ajax-items");jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate",hook:i,args:u,nonce:um_scripts.nonce},complete:function(){a.removeClass("loading")},success:function(e){a.remove(),s.append(e)}})}}),jQuery(document).on("click",".um-ajax-action",function(e){e.preventDefault();var t=jQuery(this).data("hook"),a=jQuery(this).data("user_id"),arguments=jQuery(this).data("arguments");return jQuery(this).data("js-remove")&&jQuery(this).parents("."+jQuery(this).data("js-remove")).fadeOut("fast"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_muted_action",hook:t,user_id:a,arguments:arguments,nonce:um_scripts.nonce},success:function(e){}}),!1}),jQuery(document.body).on("click","#um-search-button",function(){var e=jQuery(this).parents(".um-search-form").data("members_page"),t=[];jQuery(this).parents(".um-search-form").find('input[name="um-search-keys[]"]').each(function(){t.push(jQuery(this).val())});var a,i=jQuery(this).parents(".um-search-form").find(".um-search-field").val();if(""===i)a=e;else{for(var r="?",n=0;n<t.length;n++)r+=t[n]+"="+i,n!==t.length-1&&(r+="&");a=e+r}window.location=a}),jQuery(document.body).on("keypress",".um-search-field",function(e){if(13===e.which){var t=jQuery(this).parents(".um-search-form").data("members_page"),a=[];jQuery(this).parents(".um-search-form").find('input[name="um-search-keys[]"]').each(function(){a.push(jQuery(this).val())});var i,r=jQuery(this).val();if(""===r)i=t;else{for(var n="?",u=0;u<a.length;u++)n+=a[u]+"="+r,u!==a.length-1&&(n+="&");i=t+n}window.location=i}}),jQuery('.um-form input[class="um-button"][type="submit"]').removeAttr("disabled"),jQuery(document).one("click",'.um:not(.um-account) .um-form input[class="um-button"][type="submit"]:not(.um-has-recaptcha)',function(){jQuery(this).attr("disabled","disabled"),jQuery(this).parents("form").submit()});var s={};function o(e,t,a,i){var r=e.data("um-parent");e.attr("name"),jQuery('select[name="'+r+'"]');e.find('option[value!=""]').remove(),e.hasClass("um-child-option-disabled")||e.removeAttr("disabled");i=[];var n="";if("yes"===t.post.members_directory){var u=new URLSearchParams(window.location.search);n=u.get(t.post.child_name)}jQuery.each(t.items,function(e,t){i.push({id:e,text:t,selected:t===n})}),e.select2("destroy"),e.select2({data:i,allowClear:!0,minimumResultsForSearch:10}),"yes"!==t.post.members_directory&&(void 0===t.field.default||e.data("um-original-value")?""!=e.data("um-original-value")&&e.val(e.data("um-original-value")).trigger("change"):e.val(t.field.default).trigger("change"),0==t.field.editable&&(e.addClass("um-child-option-disabled"),e.attr("disabled","disabled"))),s[a]=t}jQuery("select[data-um-parent]").each(function(){var r=jQuery(this),n=r.data("um-parent"),u=(r.data("um-ajax-url"),r.data("um-ajax-source"));r.val();r.attr("data-um-init-field",!0),jQuery(document).on("change",'select[name="'+n+'"]',function(){var t=jQuery(this),e=t.closest("form").find('input[type="hidden"][name="form_id"]').val(),a=t.val();if(""!=t.val()&&"object"!=typeof s[a]&&jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_select_options",parent_option_name:n,parent_option:t.val(),child_callback:u,child_name:r.attr("name"),members_directory:r.attr("data-mebers-directory"),form_id:e,nonce:um_scripts.nonce},success:function(e){"success"==e.status&&""!=t.val()&&o(r,e,a),void 0!==e.debug&&console.log(e)},error:function(e){console.log(e)}}),""!=t.val()&&"object"==typeof s[a]){var i=s[a];o(r,i,a)}""==t.val()&&(r.find('option[value!=""]').remove(),r.val("").trigger("change"))}),jQuery('select[name="'+n+'"]').trigger("change")})});
\ No newline at end of file
+function um_init_datetimepicker(){jQuery(".um-datepicker:not(.picker__input)").each(function(){if(elem=jQuery(this),void 0!==elem.attr("data-disabled_weekdays")&&""!=elem.attr("data-disabled_weekdays"))var e=JSON.parse(elem.attr("data-disabled_weekdays"));else e=!1;var t=null;void 0!==elem.attr("data-years")&&(t=elem.attr("data-years"));var a=elem.attr("data-date_min"),i=elem.attr("data-date_max"),r=[],n=[];void 0!==a&&(r=a.split(",")),void 0!==i&&(n=i.split(","));var u=r.length?new Date(r):null,s=r.length?new Date(n):null;if(u&&"Invalid Date"==u.toString()&&3==r.length){var o=r[1]+"/"+r[2]+"/"+r[0];u=new Date(Date.parse(o))}if(s&&"Invalid Date"==s.toString()&&3==n.length){var d=n[1]+"/"+n[2]+"/"+n[0];s=new Date(Date.parse(d))}var l={disable:e,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}};null!==t&&(l.selectYears=t),null!==u&&(l.min=u),null!==s&&(l.max=s),elem.pickadate(l)}),jQuery(".um-timepicker:not(.picker__input)").each(function(){elem=jQuery(this),elem.pickatime({format:elem.attr("data-format"),interval:parseInt(elem.attr("data-intervals")),formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})})}function init_tipsy(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy({gravity:"n",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-w").tipsy({gravity:"w",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-e").tipsy({gravity:"e",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-s").tipsy({gravity:"s",opacity:1,live:"a.live",offset:3}))}jQuery(document).ready(function(){jQuery(document.body).on("click",".um-dropdown a.real_url",function(e){window.location=jQuery(this).attr("href")}),jQuery(document.body).on("click",".um-trigger-menu-on-click",function(e){return jQuery(".um-dropdown").hide(),jQuery(this).find(".um-dropdown").show(),!1}),jQuery(document.body).on("click",".um-dropdown-hide",function(e){return UM_hide_menus(),!1}),jQuery(document.body).on("click","a.um-manual-trigger",function(){var e=jQuery(this).attr("data-child"),t=jQuery(this).attr("data-parent");return jQuery(this).parents(t).find(e).trigger("click"),UM_hide_menus(),!1}),jQuery(".um-s1,.um-s2").css({display:"block"}),"function"==typeof jQuery.fn.select2&&(jQuery(".um-s1").select2({allowClear:!0}),jQuery(".um-s2").select2({allowClear:!1,minimumResultsForSearch:10}),jQuery(".um-s3").select2({allowClear:!1,minimumResultsForSearch:-1})),init_tipsy(),"function"==typeof jQuery.fn.um_raty&&(jQuery(".um-rating").um_raty({half:!1,starType:"i",number:function(){return jQuery(this).attr("data-number")},score:function(){return jQuery(this).attr("data-score")},scoreName:function(){return jQuery(this).attr("data-key")},hints:!1,click:function(e,t){live_field=this.id,live_value=e,um_apply_conditions(jQuery(this),!1)}}),jQuery(".um-rating-readonly").um_raty({half:!1,starType:"i",number:function(){return jQuery(this).attr("data-number")},score:function(){return jQuery(this).attr("data-score")},scoreName:function(){return jQuery(this).attr("data-key")},hints:!1,readOnly:!0})),jQuery(document).on("change",'.um-field-area input[type="radio"]',function(){var e=jQuery(this).parents(".um-field-area"),t=jQuery(this).parents("label");e.find(".um-field-radio").removeClass("active"),e.find(".um-field-radio").find("i").removeAttr("class").addClass("um-icon-android-radio-button-off"),t.addClass("active"),t.find("i").removeAttr("class").addClass("um-icon-android-radio-button-on")}),jQuery(document).on("change",'.um-field-area input[type="checkbox"]',function(){jQuery(this).parents(".um-field-area");var e=jQuery(this).parents("label");e.hasClass("active")?(e.removeClass("active"),e.find("i").removeAttr("class").addClass("um-icon-android-checkbox-outline-blank")):(e.addClass("active"),e.find("i").removeAttr("class").addClass("um-icon-android-checkbox-outline"))}),um_init_datetimepicker(),jQuery(document).on("click",".um .um-single-image-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-image-preview img").attr("src");return t.find(".um-single-image-preview img").attr("src",""),t.find(".um-single-image-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:a,nonce:um_scripts.nonce}}),!1}),jQuery(document).on("click",".um .um-single-file-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-fileinfo a").attr("href");return t.find(".um-single-file-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:a,nonce:um_scripts.nonce}}),!1}),jQuery(document).on("click",".um-field-group-head:not(.disabled)",function(){var e=jQuery(this).parents(".um-field-group"),t=e.data("max_entries");e.find(".um-field-group-body").is(":hidden")?e.find(".um-field-group-body").show():e.find(".um-field-group-body:first").clone().appendTo(e),increase_id=0,e.find(".um-field-group-body").each(function(){increase_id++,jQuery(this).find("input").each(function(){var e=jQuery(this);e.attr("id",e.data("key")+"-"+increase_id),e.attr("name",e.data("key")+"-"+increase_id),e.parent().parent().find("label").attr("for",e.data("key")+"-"+increase_id)})}),0<t&&e.find(".um-field-group-body").length==t&&jQuery(this).addClass("disabled")}),jQuery(document).on("click",".um-field-group-cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field-group"),a=t.data("max_entries");return 1<t.find(".um-field-group-body").length?jQuery(this).parents(".um-field-group-body").remove():jQuery(this).parents(".um-field-group-body").hide(),0<a&&t.find(".um-field-group-body").length<a&&t.find(".um-field-group-head").removeClass("disabled"),!1}),jQuery(document.body).on("click",".um-ajax-paginate",function(e){e.preventDefault();var t=jQuery(this),a=jQuery(this).parent();a.addClass("loading");var i=jQuery(this).data("hook");if("um_load_posts"===i){var r=1*jQuery(this).data("pages"),n=1*jQuery(this).data("page")+1;jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate_posts",author:jQuery(this).data("author"),page:n,nonce:um_scripts.nonce},complete:function(){a.removeClass("loading")},success:function(e){a.before(e),n===r?a.remove():t.data("page",n)}})}else if("um_load_comments"===i){r=1*jQuery(this).data("pages"),n=1*jQuery(this).data("page")+1;jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate_comments",user_id:jQuery(this).data("user_id"),page:n,nonce:um_scripts.nonce},complete:function(){a.removeClass("loading")},success:function(e){a.before(e),n===r?a.remove():t.data("page",n)}})}else{var u=jQuery(this).data("args"),s=jQuery(this).parents(".um").find(".um-ajax-items");jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate",hook:i,args:u,nonce:um_scripts.nonce},complete:function(){a.removeClass("loading")},success:function(e){a.remove(),s.append(e)}})}}),jQuery(document).on("click",".um-ajax-action",function(e){e.preventDefault();var t=jQuery(this).data("hook"),a=jQuery(this).data("user_id"),arguments=jQuery(this).data("arguments");return jQuery(this).data("js-remove")&&jQuery(this).parents("."+jQuery(this).data("js-remove")).fadeOut("fast"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_muted_action",hook:t,user_id:a,arguments:arguments,nonce:um_scripts.nonce},success:function(e){}}),!1}),jQuery(document.body).on("click","#um-search-button",function(){var e=jQuery(this).parents(".um-search-form").data("members_page"),t=[];jQuery(this).parents(".um-search-form").find('input[name="um-search-keys[]"]').each(function(){t.push(jQuery(this).val())});var a,i=jQuery(this).parents(".um-search-form").find(".um-search-field").val();if(""===i)a=e;else{for(var r="?",n=0;n<t.length;n++)r+=t[n]+"="+i,n!==t.length-1&&(r+="&");a=e+r}window.location=a}),jQuery(document.body).on("keypress",".um-search-field",function(e){if(13===e.which){var t=jQuery(this).parents(".um-search-form").data("members_page"),a=[];jQuery(this).parents(".um-search-form").find('input[name="um-search-keys[]"]').each(function(){a.push(jQuery(this).val())});var i,r=jQuery(this).val();if(""===r)i=t;else{for(var n="?",u=0;u<a.length;u++)n+=a[u]+"="+r,u!==a.length-1&&(n+="&");i=t+n}window.location=i}}),jQuery('.um-form input[class="um-button"][type="submit"]').removeAttr("disabled"),jQuery(document).one("click",'.um:not(.um-account) .um-form input[class="um-button"][type="submit"]:not(.um-has-recaptcha)',function(){jQuery(this).attr("disabled","disabled"),jQuery(this).parents("form").submit()});var s={};function o(e,t,a,i){var r=e.data("um-parent");e.attr("name"),jQuery('select[name="'+r+'"]');e.find('option[value!=""]').remove(),e.hasClass("um-child-option-disabled")||e.removeAttr("disabled");i=[];var n="";if("yes"===t.post.members_directory){var u=new URLSearchParams(window.location.search);n=u.get(t.post.child_name)}jQuery.each(t.items,function(e,t){i.push({id:e,text:t,selected:t===n})}),e.select2("destroy"),e.select2({data:i,allowClear:!0,minimumResultsForSearch:10}),"yes"!==t.post.members_directory&&(void 0===t.field.default||e.data("um-original-value")?""!=e.data("um-original-value")&&e.val(e.data("um-original-value")).trigger("change"):e.val(t.field.default).trigger("change"),0==t.field.editable&&(e.addClass("um-child-option-disabled"),e.attr("disabled","disabled"))),s[a]=t}jQuery("select[data-um-parent]").each(function(){var r=jQuery(this),n=r.data("um-parent"),u=(r.data("um-ajax-url"),r.data("um-ajax-source"));r.val();r.attr("data-um-init-field",!0),jQuery(document).on("change",'select[name="'+n+'"]',function(){var t=jQuery(this),e=t.closest("form").find('input[type="hidden"][name="form_id"]').val(),a=t.val();if(""!=t.val()&&"object"!=typeof s[a]&&jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_select_options",parent_option_name:n,parent_option:t.val(),child_callback:u,child_name:r.attr("name"),members_directory:r.attr("data-mebers-directory"),form_id:e,nonce:um_scripts.nonce},success:function(e){"success"==e.status&&""!=t.val()&&o(r,e,a),void 0!==e.debug&&console.log(e)},error:function(e){console.log(e)}}),""!=t.val()&&"object"==typeof s[a]){var i=s[a];o(r,i,a)}""==t.val()&&(r.find('option[value!=""]').remove(),r.val("").trigger("change"))}),jQuery('select[name="'+n+'"]').trigger("change")})});
\ No newline at end of file
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index df155b5a..ced4251c 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -826,6 +826,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		/**
 		 * Checks if an option is selected
 		 *
+		 * is used by Select, Multiselect and Checkbox fields
+		 *
 		 * @param  string $key
 		 * @param  string $value
 		 * @param  array  $data
@@ -833,6 +835,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		 * @return boolean
 		 */
 		function is_selected( $key, $value, $data ) {
+			global $wpdb;
+
 			/**
 			 * UM hook
 			 *
@@ -855,126 +859,22 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			 */
 			$key = apply_filters( 'um_is_selected_filter_key', $key );
 
-			if ( isset( UM()->form()->post_form[ $key ] ) && is_array( UM()->form()->post_form[ $key ] ) ) {
+			if ( isset( UM()->form()->post_form[ $key ] ) ) {
 
-				if ( in_array( $value, UM()->form()->post_form[ $key ] ) ) {
-					return true;
-				}
+				if ( is_array( UM()->form()->post_form[ $key ] ) ) {
 
-				$stripslashed = array_map( 'stripslashes', UM()->form()->post_form[ $key ] );
-				if ( in_array( $value, $stripslashed ) ) {
-					return true;
-				}
-
-				if ( in_array( html_entity_decode( $value ), UM()->form()->post_form[ $key ] ) ) {
-					return true;
-				}
-
-			} else {
-
-				if ( ! isset( UM()->form()->post_form[ $key ] ) ) {
-
-					$field_value = um_user( $key );
-					if ( ! $field_value ) {
-						$field_value = 0;
-					}
-
-					if( $field_value == 0 && $value == '0' ){
-						$value = (int)$value;
-					}
-
-					if ( $key == 'role' ) {
-
-						$role_keys = get_option( 'um_roles' );
-
-						if ( ! empty( $role_keys ) ) {
-							if ( in_array( $field_value, $role_keys ) ) {
-								$field_value = 'um_' . $field_value;
-							}
-						}
-					}
-
-
-					/**
-					 * UM hook
-					 *
-					 * @type filter
-					 * @title um_is_selected_filter_value
-					 * @description Change is selected filter value
-					 * @input_vars
-					 * [{"var":"$value","type":"string","desc":"Selected filter value"},
-					 * {"var":"$key","type":"string","desc":"Selected filter key"},
-					 * {"var":"$value","type":"string","desc":"Selected filter value"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage add_filter( 'um_is_selected_filter_value', 'function_name', 10, 2 );
-					 * @example
-					 * <?php
-					 * add_filter( 'um_is_selected_filter_value', 'my_selected_filter_value', 10, 2 );
-					 * function my_selected_filter_value( $value, $key ) {
-					 *     // your code here
-					 *     return $field_value;
-					 * }
-					 * ?>
-					 */
-					$field_value = apply_filters( 'um_is_selected_filter_value', $field_value, $key, $value );
-
-					/**
-					 * UM hook
-					 *
-					 * @type filter
-					 * @title um_is_selected_filter_data
-					 * @description Change is selected filter data
-					 * @input_vars
-					 * [{"var":"$data","type":"array","desc":"Selected filter value"},
-					 * {"var":"$key","type":"string","desc":"Selected filter key"},
-					 * {"var":"$value","type":"string","desc":"Selected filter value"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage add_filter( 'um_is_selected_filter_data', 'function_name', 10, 3 );
-					 * @example
-					 * <?php
-					 * add_filter( 'um_is_selected_filter_data', 'my_selected_filter_data', 10, 3 );
-					 * function my_selected_filter_data( $data, $key, $value ) {
-					 *     // your code here
-					 *     return $data;
-					 * }
-					 * ?>
-					 */
-					$data = apply_filters( 'um_is_selected_filter_data', $data, $key, $field_value );
-
-					if ( $field_value && $this->editing == true && is_array( $field_value ) && ( in_array( $value, $field_value ) || in_array( html_entity_decode( $value ), $field_value ) ) ) {
+					if ( in_array( $value, UM()->form()->post_form[ $key ] ) ) {
 						return true;
 					}
 
-					if ( $field_value == 0 && $this->editing == true && ! is_array( $field_value ) && $field_value === $value ) {
+					$stripslashed = array_map( 'stripslashes', UM()->form()->post_form[ $key ] );
+					if ( in_array( $value, $stripslashed ) ) {
 						return true;
 					}
 
-					if ( $field_value && $this->editing == true && ! is_array( $field_value ) && $field_value == $value ) {
+					if ( in_array( html_entity_decode( $value ), UM()->form()->post_form[ $key ] ) ) {
 						return true;
 					}
-
-					if ( $field_value && $this->editing == true && ! is_array( $field_value ) && html_entity_decode( $field_value ) == html_entity_decode( $value ) ) {
-						return true;
-					}
-
-					if ( empty( $field_value ) ) {
-						if ( isset( $data['default'] ) ) {
-							if ( strstr( $data['default'], ', ' ) ) {
-								$data['default'] = explode( ', ', $data['default'] );
-							}
-
-							if ( ! is_array( $data['default'] ) && $data['default'] === $value ) {
-								return true;
-							}
-
-							if ( is_array( $data['default'] ) && in_array( $value, $data['default'] ) ) {
-								return true;
-							}
-						}
-					}
-
 				} else {
 
 					if ( $value == UM()->form()->post_form[ $key ] ) {
@@ -983,6 +883,127 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				}
 
+			} else {
+
+				$field_value = um_user( $key );
+				if ( ! $field_value ) {
+					$field_value = 0;
+				}
+
+				if ( $field_value == 0 && $value == '0' ) {
+					$value = (int) $value;
+				}
+
+				if ( $key == 'role' ) {
+
+					$role_keys = get_option( 'um_roles' );
+
+					if ( ! empty( $role_keys ) ) {
+						if ( in_array( $field_value, $role_keys ) ) {
+							$field_value = 'um_' . $field_value;
+						}
+					}
+				}
+
+
+				/**
+				 * UM hook
+				 *
+				 * @type filter
+				 * @title um_is_selected_filter_value
+				 * @description Change is selected filter value
+				 * @input_vars
+				 * [{"var":"$value","type":"string","desc":"Selected filter value"},
+				 * {"var":"$key","type":"string","desc":"Selected filter key"},
+				 * {"var":"$value","type":"string","desc":"Selected filter value"}]
+				 * @change_log
+				 * ["Since: 2.0"]
+				 * @usage add_filter( 'um_is_selected_filter_value', 'function_name', 10, 2 );
+				 * @example
+				 * <?php
+				 * add_filter( 'um_is_selected_filter_value', 'my_selected_filter_value', 10, 2 );
+				 * function my_selected_filter_value( $value, $key ) {
+				 *     // your code here
+				 *     return $field_value;
+				 * }
+				 * ?>
+				 */
+				$field_value = apply_filters( 'um_is_selected_filter_value', $field_value, $key, $value );
+
+				/**
+				 * UM hook
+				 *
+				 * @type filter
+				 * @title um_is_selected_filter_data
+				 * @description Change is selected filter data
+				 * @input_vars
+				 * [{"var":"$data","type":"array","desc":"Selected filter value"},
+				 * {"var":"$key","type":"string","desc":"Selected filter key"},
+				 * {"var":"$value","type":"string","desc":"Selected filter value"}]
+				 * @change_log
+				 * ["Since: 2.0"]
+				 * @usage add_filter( 'um_is_selected_filter_data', 'function_name', 10, 3 );
+				 * @example
+				 * <?php
+				 * add_filter( 'um_is_selected_filter_data', 'my_selected_filter_data', 10, 3 );
+				 * function my_selected_filter_data( $data, $key, $value ) {
+				 *     // your code here
+				 *     return $data;
+				 * }
+				 * ?>
+				 */
+				$data = apply_filters( 'um_is_selected_filter_data', $data, $key, $field_value );
+
+				if ( ! $this->editing ) {
+					// show default on register screen if there is default
+					if ( isset( $data['default'] ) ) {
+						if ( strstr( $data['default'], ', ' ) ) {
+							$data['default'] = explode( ', ', $data['default'] );
+						}
+
+						if ( ! is_array( $data['default'] ) && $data['default'] === $value ) {
+							return true;
+						}
+
+						if ( is_array( $data['default'] ) && in_array( $value, $data['default'] ) ) {
+							return true;
+						}
+					}
+				} else {
+
+					if ( $field_value && is_array( $field_value ) && ( in_array( $value, $field_value ) || in_array( html_entity_decode( $value ), $field_value ) ) ) {
+						return true;
+					}
+
+					if ( $field_value == 0 && ! is_array( $field_value ) && $field_value === $value ) {
+						return true;
+					}
+
+					if ( $field_value && ! is_array( $field_value ) && $field_value == $value ) {
+						return true;
+					}
+
+					if ( $field_value && ! is_array( $field_value ) && html_entity_decode( $field_value ) == html_entity_decode( $value ) ) {
+						return true;
+					}
+
+					// show default on edit screen if there isn't meta row in usermeta table
+					$direct_db_value = $wpdb->get_var( $wpdb->prepare( "SELECT ISNULL( meta_value ) FROM {$wpdb->usermeta} WHERE user_id = %d AND meta_key = %s", um_user( 'ID' ), $key ) );
+					if ( ! isset( $direct_db_value ) && isset( $data['default'] ) ) {
+						if ( strstr( $data['default'], ', ' ) ) {
+							$data['default'] = explode( ', ', $data['default'] );
+						}
+
+						if ( ! is_array( $data['default'] ) && $data['default'] === $value ) {
+							return true;
+						}
+
+						if ( is_array( $data['default'] ) && in_array( $value, $data['default'] ) ) {
+							return true;
+						}
+					}
+				}
+
 			}
 
 			return false;
@@ -999,6 +1020,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		 * @return boolean
 		 */
 		function is_radio_checked( $key, $value, $data ) {
+			global $wpdb;
+
 			if ( isset( UM()->form()->post_form[ $key ] ) ) {
 				if ( is_array( UM()->form()->post_form[ $key ] ) && in_array( $value, UM()->form()->post_form[ $key ] ) ) {
 					return true;
@@ -1006,45 +1029,56 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					return true;
 				}
 			} else {
-				if ( um_user( $key ) && $this->editing == true ) {
 
-					if ( strstr( $key, 'role_' ) ) {
-						$key = 'role';
-					}
+				if ( $this->editing ) {
+					if ( um_user( $key ) ) {
 
-					$um_user_value = um_user( $key );
+						if ( strstr( $key, 'role_' ) ) {
+							$key = 'role';
+						}
 
-					if ( $key == 'role' ) {
-						$um_user_value = strtolower( $um_user_value );
+						$um_user_value = um_user( $key );
 
-						$role_keys = get_option( 'um_roles' );
+						if ( $key == 'role' ) {
+							$um_user_value = strtolower( $um_user_value );
 
-						if ( ! empty( $role_keys ) ) {
-							if ( in_array( $um_user_value, $role_keys ) ) {
-								$um_user_value = 'um_' . $um_user_value;
+							$role_keys = get_option( 'um_roles' );
+
+							if ( ! empty( $role_keys ) ) {
+								if ( in_array( $um_user_value, $role_keys ) ) {
+									$um_user_value = 'um_' . $um_user_value;
+								}
 							}
 						}
-					}
 
-					if ( $um_user_value == $value ) {
-						return true;
-					}
+						if ( $um_user_value == $value ) {
+							return true;
+						}
 
-					if ( is_array( $um_user_value ) && in_array( $value, $um_user_value ) ) {
-						return true;
-					}
+						if ( is_array( $um_user_value ) && in_array( $value, $um_user_value ) ) {
+							return true;
+						}
 
-					if ( is_array( $um_user_value ) ) {
-						foreach ( $um_user_value as $u ) {
-							if ( $u == html_entity_decode( $value ) ) {
-								return true;
+						if ( is_array( $um_user_value ) ) {
+							foreach ( $um_user_value as $u ) {
+								if ( $u == html_entity_decode( $value ) ) {
+									return true;
+								}
 							}
 						}
+					} else {
+
+						// show default on edit screen if there isn't meta row in usermeta table
+						$direct_db_value = $wpdb->get_var( $wpdb->prepare( "SELECT ISNULL( meta_value ) FROM {$wpdb->usermeta} WHERE user_id = %d AND meta_key = %s", um_user( 'ID' ), $key ) );
+						if ( ! isset( $direct_db_value ) && isset( $data['default'] ) && $data['default'] == $value ) {
+							return true;
+						}
+
+					}
+				} else {
+					if ( isset( $data['default'] ) && $data['default'] == $value ) {
+						return true;
 					}
-
-
-				} elseif ( isset( $data['default'] ) && $data['default'] == $value ) {
-					return true;
 				}
 			}
 
diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php
index 0b9e4d44..73da7fd5 100644
--- a/includes/core/class-member-directory.php
+++ b/includes/core/class-member-directory.php
@@ -275,7 +275,13 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 						if ( isset( $data['title'] ) && array_search( $data['title'], $this->filter_fields ) !== false ) {
 							$data['title'] = $data['title'] . ' (' . $key . ')';
 						}
-						$this->filter_fields[ $key ] = isset( $data['title'] ) ? $data['title'] : $data['label'];
+
+						$title = isset( $data['title'] ) ? $data['title'] : ( isset( $data['label'] ) ? $data['label'] : '' );
+						if ( empty( $title ) ) {
+							continue;
+						}
+
+						$this->filter_fields[ $key ] = $title;
 					}
 				}
 			}
diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index 4ad65262..83f110a4 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -284,22 +284,30 @@ function um_user_edit_profile( $args ) {
 			if ( isset( $args['submitted'][ $key ] ) && is_string( $args['submitted'][ $key ] ) ) {
 				$stripslashes = stripslashes( $args['submitted'][ $key ] );
 			}
-			if ( in_array( $array['type'], array( 'select' ) ) &&
-				 ! empty( $array['options'] ) && ! empty( $stripslashes ) &&
-				 ! in_array( $stripslashes, array_map( 'trim', $array['options'] ) ) && ! $has_custom_source  ) {
-				continue;
+
+			if ( in_array( $array['type'], array( 'select' ) ) ) {
+				if ( ! empty( $array['options'] ) && ! empty( $stripslashes ) && ! in_array( $stripslashes, array_map( 'trim', $array['options'] ) ) && ! $has_custom_source  ) {
+					continue;
+				}
+
+				//update empty user meta
+				if ( ! isset( $args['submitted'][ $key ] ) || $args['submitted'][ $key ] == '' ) {
+					update_user_meta( um_user( 'ID' ), $key, '' );
+				}
 			}
 
 			//validation of correct values from options in wp-admin
 			//the user cannot set invalid value in the hidden input at the page
-			if ( in_array( $array['type'], array( 'multiselect', 'checkbox', 'radio' ) ) &&
-				 ! empty( $args['submitted'][ $key ] ) && ! empty( $array['options'] ) ) {
-				$args['submitted'][ $key ] = array_map( 'stripslashes', array_map( 'trim', $args['submitted'][ $key ] ) );
-				$args['submitted'][ $key ] = array_intersect( $args['submitted'][ $key ], array_map( 'trim', $array['options'] ) );
-			}
+			if ( in_array( $array['type'], array( 'multiselect', 'checkbox', 'radio' ) ) ) {
+				if ( ! empty( $args['submitted'][ $key ] ) && ! empty( $array['options'] ) ) {
+					$args['submitted'][ $key ] = array_map( 'stripslashes', array_map( 'trim', $args['submitted'][ $key ] ) );
+					$args['submitted'][ $key ] = array_intersect( $args['submitted'][ $key ], array_map( 'trim', $array['options'] ) );
+				}
 
-			if ( $array['type'] == 'multiselect' || $array['type'] == 'checkbox' && ! isset( $args['submitted'][ $key ] ) ) {
-				delete_user_meta( um_user( 'ID' ), $key );
+				// update empty user meta
+				if ( ! isset( $args['submitted'][ $key ] ) || $args['submitted'][ $key ] == '' ) {
+					update_user_meta( um_user( 'ID' ), $key, array() );
+				}
 			}
 
 			if ( isset( $args['submitted'][ $key ] ) ) {
diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po
index 1e1d4ab4..b821dd9b 100644
--- a/languages/ultimate-member-en_US.po
+++ b/languages/ultimate-member-en_US.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Ultimate Member\n"
-"POT-Creation-Date: 2019-10-23 13:12+0300\n"
-"PO-Revision-Date: 2019-10-23 13:12+0300\n"
+"POT-Creation-Date: 2019-10-23 17:19+0300\n"
+"PO-Revision-Date: 2019-10-23 17:19+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en_US\n"
@@ -103,7 +103,7 @@ msgstr ""
 #: includes/admin/core/class-admin-builder.php:764
 #: includes/admin/core/class-admin-dragdrop.php:33
 #: includes/admin/core/class-admin-menu.php:106
-#: includes/core/class-fields.php:4321
+#: includes/core/class-fields.php:4355
 msgid "Please login as administrator"
 msgstr ""
 
@@ -274,7 +274,7 @@ msgstr ""
 #: includes/admin/templates/form/register_customize.php:80
 #: includes/admin/templates/form/register_gdpr.php:27
 #: includes/core/class-builtin.php:1135 includes/core/class-builtin.php:1150
-#: includes/core/class-member-directory.php:843
+#: includes/core/class-member-directory.php:849
 #: includes/core/um-filters-members.php:40
 msgid "Yes"
 msgstr ""
@@ -296,7 +296,7 @@ msgstr ""
 #: includes/admin/core/class-admin-forms.php:1278
 #: includes/admin/core/class-admin-forms.php:1292
 #: includes/admin/core/class-admin-notices.php:394
-#: includes/core/um-actions-profile.php:640
+#: includes/core/um-actions-profile.php:648
 msgid "Remove"
 msgstr ""
 
@@ -1305,7 +1305,7 @@ msgid "The text that appears on the button. e.g. Upload"
 msgstr ""
 
 #: includes/admin/core/class-admin-metabox.php:1957
-#: includes/core/class-fields.php:1593 includes/core/class-fields.php:1634
+#: includes/core/class-fields.php:1627 includes/core/class-fields.php:1668
 msgid "Upload"
 msgstr ""
 
@@ -3167,7 +3167,7 @@ msgid "UM Action"
 msgstr ""
 
 #: includes/admin/core/class-admin-users.php:124
-#: includes/core/class-fields.php:2486
+#: includes/core/class-fields.php:2520
 msgid "Apply"
 msgstr ""
 
@@ -4207,13 +4207,13 @@ msgstr ""
 #: includes/admin/templates/modal/dynamic_new_group.php:18
 #: includes/admin/templates/modal/fonticons.php:14
 #: includes/admin/templates/role/publish.php:24 includes/class-config.php:251
-#: includes/core/class-fields.php:2487 includes/core/class-fields.php:2584
-#: includes/core/um-actions-profile.php:641
-#: includes/core/um-actions-profile.php:653
-#: includes/core/um-actions-profile.php:841
-#: includes/core/um-actions-profile.php:874
-#: includes/core/um-actions-profile.php:1219
-#: includes/core/um-actions-profile.php:1226
+#: includes/core/class-fields.php:2521 includes/core/class-fields.php:2618
+#: includes/core/um-actions-profile.php:649
+#: includes/core/um-actions-profile.php:661
+#: includes/core/um-actions-profile.php:849
+#: includes/core/um-actions-profile.php:882
+#: includes/core/um-actions-profile.php:1227
+#: includes/core/um-actions-profile.php:1234
 msgid "Cancel"
 msgstr ""
 
@@ -4577,8 +4577,8 @@ msgid "Register"
 msgstr ""
 
 #: includes/class-config.php:135 includes/class-config.php:788
-#: includes/core/class-member-directory.php:1849
-#: includes/core/um-actions-profile.php:1225
+#: includes/core/class-member-directory.php:1855
+#: includes/core/um-actions-profile.php:1233
 #: includes/core/um-actions-user.php:19
 msgid "Logout"
 msgstr ""
@@ -5011,7 +5011,7 @@ msgid "Cover Photo"
 msgstr ""
 
 #: includes/core/class-builtin.php:1085
-#: includes/core/um-actions-profile.php:601
+#: includes/core/um-actions-profile.php:609
 msgid "Change your cover photo"
 msgstr ""
 
@@ -6934,101 +6934,101 @@ msgstr ""
 msgid "Undefined"
 msgstr ""
 
-#: includes/core/class-fields.php:1218 templates/message.php:6
+#: includes/core/class-fields.php:1252 templates/message.php:6
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: includes/core/class-fields.php:1239
+#: includes/core/class-fields.php:1273
 msgid "Custom Field"
 msgstr ""
 
-#: includes/core/class-fields.php:1582
+#: includes/core/class-fields.php:1616
 msgid "Please upload a valid image!"
 msgstr ""
 
-#: includes/core/class-fields.php:1596
+#: includes/core/class-fields.php:1630
 msgid "Sorry this is not a valid image."
 msgstr ""
 
-#: includes/core/class-fields.php:1599
+#: includes/core/class-fields.php:1633
 msgid "This image is too large!"
 msgstr ""
 
-#: includes/core/class-fields.php:1602
+#: includes/core/class-fields.php:1636
 msgid "This image is too small!"
 msgstr ""
 
-#: includes/core/class-fields.php:1605
+#: includes/core/class-fields.php:1639
 msgid "You can only upload one image"
 msgstr ""
 
-#: includes/core/class-fields.php:1637
+#: includes/core/class-fields.php:1671
 msgid "Sorry this is not a valid file."
 msgstr ""
 
-#: includes/core/class-fields.php:1640
+#: includes/core/class-fields.php:1674
 msgid "This file is too large!"
 msgstr ""
 
-#: includes/core/class-fields.php:1643
+#: includes/core/class-fields.php:1677
 msgid "This file is too small!"
 msgstr ""
 
-#: includes/core/class-fields.php:1646
+#: includes/core/class-fields.php:1680
 msgid "You can only upload one file"
 msgstr ""
 
-#: includes/core/class-fields.php:2146
+#: includes/core/class-fields.php:2180
 msgid "Current Password"
 msgstr ""
 
-#: includes/core/class-fields.php:2175
+#: includes/core/class-fields.php:2209
 msgid "New Password"
 msgstr ""
 
-#: includes/core/class-fields.php:2207
+#: includes/core/class-fields.php:2241
 #, php-format
 msgid "Confirm %s"
 msgstr ""
 
-#: includes/core/class-fields.php:2441
+#: includes/core/class-fields.php:2475
 msgid "Upload Photo"
 msgstr ""
 
-#: includes/core/class-fields.php:2462 includes/core/class-fields.php:2486
-#: includes/core/um-actions-profile.php:872
+#: includes/core/class-fields.php:2496 includes/core/class-fields.php:2520
+#: includes/core/um-actions-profile.php:880
 msgid "Change photo"
 msgstr ""
 
-#: includes/core/class-fields.php:2486 includes/core/class-fields.php:2583
+#: includes/core/class-fields.php:2520 includes/core/class-fields.php:2617
 msgid "Processing..."
 msgstr ""
 
-#: includes/core/class-fields.php:2508
+#: includes/core/class-fields.php:2542
 msgid "Upload File"
 msgstr ""
 
-#: includes/core/class-fields.php:2550 includes/core/um-filters-fields.php:267
+#: includes/core/class-fields.php:2584 includes/core/um-filters-fields.php:267
 msgid "This file has been removed."
 msgstr ""
 
-#: includes/core/class-fields.php:2553 includes/core/class-fields.php:2583
+#: includes/core/class-fields.php:2587 includes/core/class-fields.php:2617
 msgid "Change file"
 msgstr ""
 
-#: includes/core/class-fields.php:2583
+#: includes/core/class-fields.php:2617
 msgid "Save"
 msgstr ""
 
-#: includes/core/class-fields.php:4054
+#: includes/core/class-fields.php:4088
 #, php-format
 msgid ""
 "Your profile is looking a little empty. Why not <a href=\"%s\">add</a> some "
 "information!"
 msgstr ""
 
-#: includes/core/class-fields.php:4056
+#: includes/core/class-fields.php:4090
 msgid "This user has not added any information to their profile yet."
 msgstr ""
 
@@ -7118,23 +7118,23 @@ msgstr ""
 msgid "User Registered"
 msgstr ""
 
-#: includes/core/class-member-directory.php:641
+#: includes/core/class-member-directory.php:647
 msgid " stars"
 msgstr ""
 
-#: includes/core/class-member-directory.php:649
+#: includes/core/class-member-directory.php:655
 msgid "<strong>Age:</strong>&nbsp;{min_range} - {max_range} years old"
 msgstr ""
 
-#: includes/core/class-member-directory.php:1794
-#: includes/core/class-member-directory.php:1838
-#: includes/core/um-actions-profile.php:1192
-#: includes/core/um-actions-profile.php:1223
+#: includes/core/class-member-directory.php:1800
+#: includes/core/class-member-directory.php:1844
+#: includes/core/um-actions-profile.php:1200
+#: includes/core/um-actions-profile.php:1231
 msgid "Edit Profile"
 msgstr ""
 
-#: includes/core/class-member-directory.php:1844
-#: includes/core/um-actions-profile.php:1224
+#: includes/core/class-member-directory.php:1850
+#: includes/core/um-actions-profile.php:1232
 msgid "My Account"
 msgstr ""
 
@@ -7631,34 +7631,34 @@ msgstr ""
 msgid "You are not allowed to edit this user."
 msgstr ""
 
-#: includes/core/um-actions-profile.php:320
+#: includes/core/um-actions-profile.php:328
 #, php-format
 msgid "Your choosed %s"
 msgstr ""
 
-#: includes/core/um-actions-profile.php:636
-#: includes/core/um-actions-profile.php:652
-#: includes/core/um-actions-profile.php:723
+#: includes/core/um-actions-profile.php:644
+#: includes/core/um-actions-profile.php:660
+#: includes/core/um-actions-profile.php:731
 msgid "Upload a cover photo"
 msgstr ""
 
-#: includes/core/um-actions-profile.php:636
+#: includes/core/um-actions-profile.php:644
 msgid "Change cover photo"
 msgstr ""
 
-#: includes/core/um-actions-profile.php:840
+#: includes/core/um-actions-profile.php:848
 msgid "Upload photo"
 msgstr ""
 
-#: includes/core/um-actions-profile.php:873
+#: includes/core/um-actions-profile.php:881
 msgid "Remove photo"
 msgstr ""
 
-#: includes/core/um-actions-profile.php:1034
+#: includes/core/um-actions-profile.php:1042
 msgid "Tell us a bit about yourself..."
 msgstr ""
 
-#: includes/core/um-actions-profile.php:1049
+#: includes/core/um-actions-profile.php:1057
 #, php-format
 msgid "This user account status is %s"
 msgstr ""