diff --git a/build/js/intlTelInput.js b/build/js/intlTelInput.js
index 6a9aaa151..00c056d01 100644
--- a/build/js/intlTelInput.js
+++ b/build/js/intlTelInput.js
@@ -290,32 +290,40 @@ https://github.com/Bluefieldscom/intl-tel-input.git
                 }
             }
         },
-        // handle a key event on the input - deals with replacing any currently selected chars, and formatting
+        // handle a key event on the input - deals with replacing any currently selected chars, and then formatting and then putting the cursor back in the right place
         _handleInputKey: function(e, isDelete, newChar, isAllowed) {
-            var val = this.telInput.val(), newCaretStart = null, newCaretEnd = null, // raw DOM element
+            var val = this.telInput.val(), newCursor = null, cursorAtEnd = false, // raw DOM element
             input = this.telInput[0];
-            if (isAllowed) {
-                if (this.isGoodBrowser) {
-                    var selectionEnd = input.selectionEnd, originalLen = val.length;
+            if (this.isGoodBrowser) {
+                var selectionStart = input.selectionStart, originalLen = val.length;
+                // at this point, cursorAtEnd should be false even if selectionEnd is at the end, because if isAllowed is false, we wont be replacing the selection
+                cursorAtEnd = selectionStart == originalLen;
+                if (isAllowed) {
+                    var selectionEnd = input.selectionEnd;
                     // replace any selection they may have made with the new char
-                    val = val.substring(0, input.selectionStart) + newChar + val.substring(selectionEnd, val.length);
-                    // if the cursor/end of selection was not at the end, calculate the newCaretPos
-                    if (input.selectionEnd !== originalLen) {
-                        newCaretStart = newCaretEnd = selectionEnd + (val.length - originalLen);
+                    val = val.substring(0, selectionStart) + newChar + val.substring(selectionEnd, originalLen);
+                    // if the cursor/end of selection was at the end, we will make sure it's there afterwards
+                    // else calculate the newCursor position
+                    if (selectionEnd === originalLen) {
+                        cursorAtEnd = true;
+                    } else {
+                        newCursor = selectionEnd + (val.length - originalLen);
                     }
-                } else {
-                    val += newChar;
                 }
-            } else if (this.isGoodBrowser) {
-                // if not an allowed char, preserve their selection
-                newCaretStart = input.selectionStart;
-                newCaretEnd = input.selectionEnd;
+            } else if (isAllowed) {
+                val += newChar;
             }
-            // still re-format the number even if key is not allowed as may need to add formatting suffix
-            this.setNumber(val, isDelete);
-            // update the caret position
-            if (this.isGoodBrowser && newCaretStart) {
-                input.setSelectionRange(newCaretStart, newCaretEnd);
+            // if the cursor is at the end, then always trigger a reformat as may want to add extra formatting suffix
+            if (isAllowed || cursorAtEnd) {
+                // update the number and flag
+                this.setNumber(val, isDelete);
+                // update the cursor position
+                if (cursorAtEnd) {
+                    newCursor = this.telInput.val().length;
+                }
+                if (this.isGoodBrowser && newCursor) {
+                    input.setSelectionRange(newCursor, newCursor);
+                }
             }
         },
         // on focus: if empty add dial code. on blur: if just dial code, then empty it
diff --git a/build/js/intlTelInput.min.js b/build/js/intlTelInput.min.js
index 0edc6f15b..91ec10ebc 100644
--- a/build/js/intlTelInput.min.js
+++ b/build/js/intlTelInput.min.js
@@ -2,4 +2,4 @@
 International Telephone Input v1.2.1
 https://github.com/Bluefieldscom/intl-tel-input.git
 */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],function(b){a(b,window,document)}):a(jQuery,window,document)}(function(a,b,c,d){"use strict";function e(b,c){this.element=b,this.options=a.extend({},h,c),this._defaults=h,this.ns="."+f+g++,this.isGoodBrowser=Boolean(b.setSelectionRange),this._name=f,this.init()}var f="intlTelInput",g=1,h={autoFormat:!0,autoHideDialCode:!0,defaultCountry:"",nationalMode:!1,onlyCountries:[],preferredCountries:["us","gb"],responsiveDropdown:!1,validationScript:""},i={UP:38,DOWN:40,ENTER:13,ESC:27,PLUS:43,A:65,Z:90,ZERO:48,NINE:57,SPACE:32,BACKSPACE:8,DELETE:46},j=!1;a(b).load(function(){j=!0}),e.prototype={init:function(){this.options.nationalMode&&(this.options.autoFormat=this.options.autoHideDialCode=!1),this._processCountryData(),this._generateMarkup(),this._setInitialState(),this._initListeners()},_processCountryData:function(){this._setInstanceCountryData(),this._setPreferredCountries()},_setInstanceCountryData:function(){var b=this;if(this.options.onlyCountries.length){var c,d,e=[],f={};for(d=0;d<this.options.onlyCountries.length;d++){var g=this.options.onlyCountries[d],h=b._getCountryData(g,!0,!1);h&&(e.push(h),c=h.dialCode,f[c]?f[c].push(g):f[c]=[g])}for(c in f)if(f[c].length>1){var i=[];for(d=0;d<n[c].length;d++){var j=n[c][d];a.inArray(f[c],j)&&i.push(j)}f[c]=i}this.countries=e,this.countryCodes=f}else this.countries=k,this.countryCodes=n},_setPreferredCountries:function(){var a=this;this.preferredCountries=[];for(var b=0;b<this.options.preferredCountries.length;b++){var c=this.options.preferredCountries[b],d=a._getCountryData(c,!1,!0);d&&a.preferredCountries.push(d)}},_generateMarkup:function(){this.telInput=a(this.element),this.telInput.wrap(a("<div>",{"class":"intl-tel-input"}));var b=a("<div>",{"class":"flag-dropdown"}).insertAfter(this.telInput),c=a("<div>",{"class":"selected-flag"}).appendTo(b);this.selectedFlagInner=a("<div>",{"class":"flag"}).appendTo(c),a("<div>",{"class":"arrow"}).appendTo(this.selectedFlagInner),this.countryList=a("<ul>",{"class":"country-list v-hide"}).appendTo(b),this.preferredCountries.length&&(this._appendListItems(this.preferredCountries,"preferred"),a("<li>",{"class":"divider"}).appendTo(this.countryList)),this._appendListItems(this.countries,""),this.dropdownHeight=this.countryList.outerHeight(),this.countryList.removeClass("v-hide").addClass("hide"),this.options.responsiveDropdown&&this.countryList.outerWidth(this.telInput.outerWidth()),this.countryListItems=this.countryList.children(".country")},_appendListItems:function(a,b){for(var c="",d=0;d<a.length;d++){var e=a[d];c+="<li class='country "+b+"' data-dial-code='"+e.dialCode+"' data-country-code='"+e.iso2+"'>",c+="<div class='flag "+e.iso2+"'></div>",c+="<span class='country-name'>"+e.name+"</span>",c+="<span class='dial-code'>+"+e.dialCode+"</span>",c+="</li>"}this.countryList.append(c)},_setInitialState:function(){if(!this.setNumber(this.telInput.val())){var a;a=this.options.defaultCountry?this._getCountryData(this.options.defaultCountry,!1,!1):this.preferredCountries.length?this.preferredCountries[0]:this.countries[0],this._selectFlag(a.iso2),this.options.autoHideDialCode||this._resetToDialCode(a.dialCode)}},_initListeners:function(){var d=this;this.options.autoHideDialCode&&this._initAutoHideDialCode();var e=this.telInput.closest("label");e.length&&e.on("click"+this.ns,function(a){d.countryList.hasClass("hide")?d.telInput.focus():a.preventDefault()}),this.options.autoFormat&&this.telInput.on("keypress"+this.ns,function(a){a.preventDefault();var b=a.which==i.PLUS||a.which>=i.ZERO&&a.which<=i.NINE;d._handleInputKey(a,!1,String.fromCharCode(a.which),b)}),this.telInput.on("keyup"+this.ns,function(a){d.options.autoFormat?(a.which==i.BACKSPACE||a.which==i.DELETE)&&d._handleInputKey(a,!0,"",!0):d.setNumber(d.telInput.val())});var f=this.selectedFlagInner.parent();if(f.on("click"+this.ns,function(){d.countryList.hasClass("hide")&&!d.telInput.prop("disabled")&&d._showDropdown()}),this.options.validationScript){var g=function(){var a=c.createElement("script");a.type="text/javascript",a.src=d.options.validationScript,c.body.appendChild(a)};j?g():a(b).load(g)}},_handleInputKey:function(a,b,c,d){var e=this.telInput.val(),f=null,g=null,h=this.telInput[0];if(d)if(this.isGoodBrowser){var i=h.selectionEnd,j=e.length;e=e.substring(0,h.selectionStart)+c+e.substring(i,e.length),h.selectionEnd!==j&&(f=g=i+(e.length-j))}else e+=c;else this.isGoodBrowser&&(f=h.selectionStart,g=h.selectionEnd);this.setNumber(e,b),this.isGoodBrowser&&f&&h.setSelectionRange(f,g)},_initAutoHideDialCode:function(){var b=this;this.telInput.on("mousedown"+this.ns,function(a){b.telInput.is(":focus")||b.telInput.val()||(a.preventDefault(),b._focus())}),this.telInput.on("focus"+this.ns,function(){a.trim(b.telInput.val())||(b._updateVal("+"+b.selectedCountryData.dialCode,!0),b.telInput.one("keypress.plus"+b.ns,function(a){a.which==i.PLUS&&b.telInput.val("+")}))}),this.telInput.on("blur"+this.ns,function(){var c=b.telInput.val(),d="+"==c.substring(0,1),e=c.replace(/\D/g,"");d&&e&&(c="+"+e,a.trim(b._getDialCode(c))==c&&b.telInput.val("")),b.telInput.off("keypress.plus"+b.ns)})},_focus:function(){this.telInput.focus();var a=this.telInput[0];if(this.isGoodBrowser){var b=this.telInput.val().length;a.setSelectionRange(b,b)}},_showDropdown:function(){this._setDropdownPosition();var a=this.countryList.children(".active");this._highlightListItem(a),this.countryList.removeClass("hide"),this._scrollTo(a),this._bindDropdownListeners(),this.selectedFlagInner.children(".arrow").addClass("up")},_setDropdownPosition:function(){var c=this.telInput.offset().top,d=a(b).scrollTop(),e=c+this.telInput.outerHeight()+this.dropdownHeight<d+a(b).height(),f=c-this.dropdownHeight>d,g=!e&&f?"-"+(this.dropdownHeight-1)+"px":"";this.countryList.css("top",g)},_bindDropdownListeners:function(){var b=this;this.countryList.on("mouseover"+this.ns,".country",function(){b._highlightListItem(a(this))}),this.countryList.on("click"+this.ns,".country",function(){b._selectListItem(a(this))});var d=!0;a("html").on("click"+this.ns,function(){d||b._closeDropdown(),d=!1});var e="",f=null;a(c).on("keydown"+this.ns,function(a){a.preventDefault(),a.which==i.UP||a.which==i.DOWN?b._handleUpDownKey(a.which):a.which==i.ENTER?b._handleEnterKey():a.which==i.ESC?b._closeDropdown():(a.which>=i.A&&a.which<=i.Z||a.which==i.SPACE)&&(f&&clearTimeout(f),e+=String.fromCharCode(a.which),b._searchForCountry(e),f=setTimeout(function(){e=""},1e3))})},_handleUpDownKey:function(a){var b=this.countryList.children(".highlight").first(),c=a==i.UP?b.prev():b.next();c.length&&(c.hasClass("divider")&&(c=a==i.UP?c.prev():c.next()),this._highlightListItem(c),this._scrollTo(c))},_handleEnterKey:function(){var a=this.countryList.children(".highlight").first();a.length&&this._selectListItem(a)},_searchForCountry:function(a){for(var b=0;b<this.countries.length;b++)if(this._startsWith(this.countries[b].name,a)){var c=this.countryList.children("[data-country-code="+this.countries[b].iso2+"]").not(".preferred");this._highlightListItem(c),this._scrollTo(c,!0);break}},_startsWith:function(a,b){return a.substr(0,b.length).toUpperCase()==b},_updateVal:function(a,b,c){var d,e="";if(this.options.autoFormat){if(d=a.replace(/\D/g,""),b){var f=this.selectedCountryData.format;if(f)for(var g=0;g<f.length;g++)if("."==f[g]){if(!d)break;if(e+=d.substring(0,1),d=d.substring(1),!d&&c)break}else e+=f[g]}e||"+"!=a.substring(0,1)||(e="+")}else d=a;this.telInput.val(e+d)},_resetToDialCode:function(a){var b=this.options.nationalMode?"":"+"+a;this.telInput.val(b)},_highlightListItem:function(a){this.countryListItems.removeClass("highlight"),a.addClass("highlight")},_getCountryData:function(a,b,c){for(var d=b?k:this.countries,e=0;e<d.length;e++)if(d[e].iso2==a)return d[e];if(c)return null;throw new Error("No country data for '"+a+"'")},_selectFlag:function(a){this.selectedFlagInner.attr("class","flag "+a),this.selectedCountryData=this._getCountryData(a,!1,!1);var b=this.selectedCountryData.name+": +"+this.selectedCountryData.dialCode;this.selectedFlagInner.parent().attr("title",b);var c=this.countryListItems.children(".flag."+a).first().parent();this.countryListItems.removeClass("active"),c.addClass("active")},_selectListItem:function(a){var b=a.attr("data-country-code");this._selectFlag(b),this._closeDropdown(),this.options.nationalMode||(this._updateDialCode("+"+a.attr("data-dial-code")),this.telInput.trigger("change")),this._focus()},_closeDropdown:function(){this.countryList.addClass("hide"),this.selectedFlagInner.children(".arrow").removeClass("up"),a(c).off(this.ns),a("html").off(this.ns),this.countryList.off(this.ns)},_scrollTo:function(a,b){var c=this.countryList,d=c.height(),e=c.offset().top,f=e+d,g=a.outerHeight(),h=a.offset().top,i=h+g,j=h-e+c.scrollTop(),k=d/2-g/2;if(e>h)b&&(j-=k),c.scrollTop(j);else if(i>f){b&&(j+=k);var l=d-g;c.scrollTop(j-l)}},_updateDialCode:function(b){var c,d=this.telInput.val(),e=this._getDialCode(d);if(e.length>1)c=d.replace(e,b);else{var f=d&&"+"!=d.substr(0,1)?a.trim(d):"";c=b+f}this._updateVal(c,!0)},_getDialCode:function(b){var c="";if(b=a.trim(b),"+"==b.charAt(0))for(var d="",e=0;e<b.length;e++){var f=b.charAt(e);if(a.isNumeric(f)&&(d+=f,this.countryCodes[d]&&(c=b.substring(0,e+1)),4==d.length))break}return c},destroy:function(){this._closeDropdown(),this.telInput.off(this.ns),this.selectedFlagInner.parent().off(this.ns),this.telInput.closest("label").off(this.ns);var a=this.telInput.parent();a.before(this.telInput).remove()},getSelectedCountryData:function(){return this.selectedCountryData},isValidNumber:function(c){var d=a.trim(this.telInput.val()),e=c?this.selectedCountryData.iso2:"",f=/[a-zA-Z]/.test(d);return!f&&b.isValidNumber(d,e)},selectCountry:function(a){this.selectedFlagInner.hasClass(a)||(this._selectFlag(a),this.telInput.val()||this.options.autoHideDialCode||this._resetToDialCode(this.selectedCountryData.dialCode))},setNumber:function(a,b){var c=this,d=this._getDialCode(a);if(d){for(var e=this.countryCodes[d.replace(/\D/g,"")],f=!1,g=0;g<e.length;g++)c.selectedFlagInner.hasClass(e[g])&&(f=!0);f||this._selectFlag(e[0])}return this._updateVal(a,d,b),d}},a.fn[f]=function(b){var c=arguments;if(b===d||"object"==typeof b)return this.each(function(){a.data(this,"plugin_"+f)||a.data(this,"plugin_"+f,new e(this,b))});if("string"==typeof b&&"_"!==b[0]&&"init"!==b){var g;return this.each(function(){var d=a.data(this,"plugin_"+f);d instanceof e&&"function"==typeof d[b]&&(g=d[b].apply(d,Array.prototype.slice.call(c,1))),"destroy"===b&&a.data(this,"plugin_"+f,null)}),g!==d?g:this}},a.fn[f].getCountryData=function(){return k},a.fn[f].setCountryData=function(a){k=a};for(var k=[["Afghanistan (‫افغانستان‬‎)","af","93"],["Åland Islands (Åland)","ax","358","+... .. ... .. .."],["Albania (Shqipëri)","al","355"],["Algeria (‫الجزائر‬‎)","dz","213"],["American Samoa","as","1684"],["Andorra","ad","376"],["Angola","ao","244"],["Anguilla","ai","1264"],["Antigua and Barbuda","ag","1268"],["Argentina","ar","54"],["Armenia (Հայաստան)","am","374"],["Aruba","aw","297"],["Australia","au","61","+.. ... ... ..."],["Austria (Österreich)","at","43"],["Azerbaijan (Azərbaycan)","az","994"],["Bahamas","bs","1242"],["Bahrain (‫البحرين‬‎)","bh","973"],["Bangladesh (বাংলাদেশ)","bd","880"],["Barbados","bb","1246"],["Belarus (Беларусь)","by","375"],["Belgium (België)","be","32","+.. ... .. .. .."],["Belize","bz","501"],["Benin (Bénin)","bj","229"],["Bermuda","bm","1441"],["Bhutan (འབྲུག)","bt","975"],["Bolivia","bo","591"],["Bosnia and Herzegovina (Босна и Херцеговина)","ba","387"],["Botswana","bw","267"],["Brazil (Brasil)","br","55"],["British Indian Ocean Territory","io","246"],["British Virgin Islands","vg","1284"],["Brunei","bn","673"],["Bulgaria (България)","bg","359"],["Burkina Faso","bf","226"],["Burundi (Uburundi)","bi","257"],["Cambodia (កម្ពុជា)","kh","855"],["Cameroon (Cameroun)","cm","237"],["Canada","ca","1","+. (...) ...-...."],["Cape Verde (Kabu Verdi)","cv","238"],["Caribbean Netherlands","bq","5997"],["Cayman Islands","ky","1345"],["Central African Republic (République centrafricaine)","cf","236"],["Chad (Tchad)","td","235"],["Chile","cl","56"],["China (中国)","cn","86","+.. ..-........"],["Christmas Island","cx","61","+.. ... ... ..."],["Cocos (Keeling) Islands (Kepulauan Cocos (Keeling))","cc","61","+.. ... ... ..."],["Colombia","co","57"],["Comoros (‫جزر القمر‬‎)","km","269"],["Congo (DRC) (Jamhuri ya Kidemokrasia ya Kongo)","cd","243"],["Congo (Republic) (Congo-Brazzaville)","cg","242"],["Cook Islands","ck","682"],["Costa Rica","cr","506","+... ....-...."],["Côte d’Ivoire","ci","225"],["Croatia (Hrvatska)","hr","385"],["Cuba","cu","53"],["Curaçao","cw","5999"],["Cyprus (Κύπρος)","cy","357"],["Czech Republic (Česká republika)","cz","420"],["Denmark (Danmark)","dk","45","+.. .. .. .. .."],["Djibouti","dj","253"],["Dominica","dm","1767"],["Dominican Republic (República Dominicana)","do","1809"],["Ecuador","ec","593"],["Egypt (‫مصر‬‎)","eg","20"],["El Salvador","sv","503","+... ....-...."],["Equatorial Guinea (Guinea Ecuatorial)","gq","240"],["Eritrea","er","291"],["Estonia (Eesti)","ee","372"],["Ethiopia","et","251"],["Falkland Islands (Islas Malvinas)","fk","500"],["Faroe Islands (Føroyar)","fo","298"],["Fiji","fj","679"],["Finland (Suomi)","fi","358","+... .. ... .. .."],["France","fr","33","+.. . .. .. .. .."],["French Guiana (Guyane française)","gf","594"],["French Polynesia (Polynésie française)","pf","689"],["Gabon","ga","241"],["Gambia","gm","220"],["Georgia (საქართველო)","ge","995"],["Germany (Deutschland)","de","49","+.. ... ......."],["Ghana (Gaana)","gh","233"],["Gibraltar","gi","350"],["Greece (Ελλάδα)","gr","30"],["Greenland (Kalaallit Nunaat)","gl","299"],["Grenada","gd","1473"],["Guadeloupe","gp","590"],["Guam","gu","1671"],["Guatemala","gt","502","+... ....-...."],["Guernsey","gg","44","+.. .... ......"],["Guinea (Guinée)","gn","224"],["Guinea-Bissau (Guiné Bissau)","gw","245"],["Guyana","gy","592"],["Haiti","ht","509","+... ....-...."],["Honduras","hn","504"],["Hong Kong (香港)","hk","852","+... .... ...."],["Hungary (Magyarország)","hu","36"],["Iceland (Ísland)","is","354","+... ... ...."],["India (भारत)","in","91","+.. .....-....."],["Indonesia","id","62"],["Iran (‫ایران‬‎)","ir","98"],["Iraq (‫العراق‬‎)","iq","964"],["Ireland","ie","353","+... .. ......."],["Isle of Man","im","44","+.. .... ......"],["Israel (‫ישראל‬‎)","il","972"],["Italy (Italia)","it","39","+.. ... ......"],["Jamaica","jm","1876"],["Japan (日本)","jp","81","+.. ... .. ...."],["Jersey","je","44","+.. .... ......"],["Jordan (‫الأردن‬‎)","jo","962"],["Kazakhstan (Казахстан)","kz","7","+. ... ...-..-.."],["Kenya","ke","254"],["Kiribati","ki","686"],["Kosovo (Kosovë)","xk","377"],["Kuwait (‫الكويت‬‎)","kw","965"],["Kyrgyzstan (Кыргызстан)","kg","996"],["Laos (ລາວ)","la","856"],["Latvia (Latvija)","lv","371"],["Lebanon (‫لبنان‬‎)","lb","961"],["Lesotho","ls","266"],["Liberia","lr","231"],["Libya (‫ليبيا‬‎)","ly","218"],["Liechtenstein","li","423"],["Lithuania (Lietuva)","lt","370"],["Luxembourg","lu","352"],["Macau (澳門)","mo","853"],["Macedonia (FYROM) (Македонија)","mk","389"],["Madagascar (Madagasikara)","mg","261"],["Malawi","mw","265"],["Malaysia","my","60","+.. ..-....-...."],["Maldives","mv","960"],["Mali","ml","223"],["Malta","mt","356"],["Marshall Islands","mh","692"],["Martinique","mq","596"],["Mauritania (‫موريتانيا‬‎)","mr","222"],["Mauritius (Moris)","mu","230"],["Mayotte","yt","262"],["Mexico (México)","mx","52"],["Micronesia","fm","691"],["Moldova (Republica Moldova)","md","373"],["Monaco","mc","377"],["Mongolia (Монгол)","mn","976"],["Montenegro (Crna Gora)","me","382"],["Montserrat","ms","1664"],["Morocco (‫المغرب‬‎)","ma","212"],["Mozambique (Moçambique)","mz","258"],["Myanmar (Burma) (မြန်မာ)","mm","95"],["Namibia (Namibië)","na","264"],["Nauru","nr","674"],["Nepal (नेपाल)","np","977"],["Netherlands (Nederland)","nl","31","+.. .. ........"],["New Caledonia (Nouvelle-Calédonie)","nc","687"],["New Zealand","nz","64","+.. ...-...-...."],["Nicaragua","ni","505"],["Niger (Nijar)","ne","227"],["Nigeria","ng","234"],["Niue","nu","683"],["Norfolk Island","nf","672"],["North Korea (조선 민주주의 인민 공화국)","kp","850"],["Northern Mariana Islands","mp","1670"],["Norway (Norge)","no","47","+.. ... .. ..."],["Oman (‫عُمان‬‎)","om","968"],["Pakistan (‫پاکستان‬‎)","pk","92","+.. ...-......."],["Palau","pw","680"],["Palestine (‫فلسطين‬‎)","ps","970"],["Panama (Panamá)","pa","507"],["Papua New Guinea","pg","675"],["Paraguay","py","595"],["Peru (Perú)","pe","51"],["Philippines","ph","63","+.. ... ...."],["Pitcairn Islands","pn","64","+.. ...-...-...."],["Poland (Polska)","pl","48","+.. ...-...-..."],["Portugal","pt","351"],["Puerto Rico","pr","1787"],["Qatar (‫قطر‬‎)","qa","974"],["Réunion (La Réunion)","re","262"],["Romania (România)","ro","40"],["Russia (Россия)","ru","7","+. ... ...-..-.."],["Rwanda","rw","250"],["Saint Barthélemy (Saint-Barthélemy)","bl","590"],["Saint Helena","sh","290"],["Saint Kitts and Nevis","kn","1869"],["Saint Lucia","lc","1758"],["Saint Martin (Saint-Martin (partie française))","mf","590"],["Saint Pierre and Miquelon (Saint-Pierre-et-Miquelon)","pm","508"],["Saint Vincent and the Grenadines","vc","1784"],["Samoa","ws","685"],["San Marino","sm","378"],["São Tomé and Príncipe (São Tomé e Príncipe)","st","239"],["Saudi Arabia (‫المملكة العربية السعودية‬‎)","sa","966"],["Senegal (Sénégal)","sn","221"],["Serbia (Србија)","rs","381"],["Seychelles","sc","248"],["Sierra Leone","sl","232"],["Singapore","sg","65","+.. ....-...."],["Sint Maarten","sx","1721"],["Slovakia (Slovensko)","sk","421"],["Slovenia (Slovenija)","si","386"],["Solomon Islands","sb","677"],["Somalia (Soomaaliya)","so","252"],["South Africa","za","27"],["South Georgia & South Sandwich Islands","gs","500"],["South Korea (대한민국)","kr","82"],["South Sudan (‫جنوب السودان‬‎)","ss","211"],["Spain (España)","es","34","+.. ... ... ..."],["Sri Lanka (ශ්‍රී ලංකාව)","lk","94"],["Sudan (‫السودان‬‎)","sd","249"],["Suriname","sr","597"],["Svalbard and Jan Mayen (Svalbard og Jan Mayen)","sj","4779"],["Swaziland","sz","268"],["Sweden (Sverige)","se","46"],["Switzerland (Schweiz)","ch","41","+.. .. ... .. .."],["Syria (‫سوريا‬‎)","sy","963"],["Taiwan (台灣)","tw","886"],["Tajikistan","tj","992"],["Tanzania","tz","255"],["Thailand (ไทย)","th","66"],["Timor-Leste","tl","670"],["Togo","tg","228"],["Tokelau","tk","690"],["Tonga","to","676"],["Trinidad and Tobago","tt","1868"],["Tunisia (‫تونس‬‎)","tn","216"],["Turkey (Türkiye)","tr","90","+.. ... ... .. .."],["Turkmenistan","tm","993"],["Turks and Caicos Islands","tc","1649"],["Tuvalu","tv","688"],["Uganda","ug","256"],["Ukraine (Україна)","ua","380"],["United Arab Emirates (‫الإمارات العربية المتحدة‬‎)","ae","971"],["United Kingdom","gb","44","+.. .... ......"],["United States","us","1","+. (...) ...-...."],["U.S. Virgin Islands","vi","1340"],["Uruguay","uy","598"],["Uzbekistan (Oʻzbekiston)","uz","998"],["Vanuatu","vu","678"],["Vatican City (Città del Vaticano)","va","379"],["Venezuela","ve","58"],["Vietnam (Việt Nam)","vn","84"],["Wallis and Futuna","wf","681"],["Western Sahara (‫الصحراء الغربية‬‎)","eh","212"],["Yemen (‫اليمن‬‎)","ye","967"],["Zambia","zm","260"],["Zimbabwe","zw","263"]],l=0;l<k.length;l++){var m=k[l];k[l]={name:m[0],iso2:m[1],dialCode:m[2]},m[3]&&(k[l].format=m[3])}var n={1:["us","ca"],7:["ru","kz"],20:["eg"],27:["za"],30:["gr"],31:["nl"],32:["be"],33:["fr"],34:["es"],36:["hu"],39:["it"],40:["ro"],41:["ch"],43:["at"],44:["gb","gg","im","je"],45:["dk"],46:["se"],47:["no"],48:["pl"],49:["de"],51:["pe"],52:["mx"],53:["cu"],54:["ar"],55:["br"],56:["cl"],57:["co"],58:["ve"],60:["my"],61:["au","cc","cx"],62:["id"],63:["ph"],64:["nz","pn"],65:["sg"],66:["th"],81:["jp"],82:["kr"],84:["vn"],86:["cn"],90:["tr"],91:["in"],92:["pk"],93:["af"],94:["lk"],95:["mm"],98:["ir"],211:["ss"],212:["ma","eh"],213:["dz"],216:["tn"],218:["ly"],220:["gm"],221:["sn"],222:["mr"],223:["ml"],224:["gn"],225:["ci"],226:["bf"],227:["ne"],228:["tg"],229:["bj"],230:["mu"],231:["lr"],232:["sl"],233:["gh"],234:["ng"],235:["td"],236:["cf"],237:["cm"],238:["cv"],239:["st"],240:["gq"],241:["ga"],242:["cg"],243:["cd"],244:["ao"],245:["gw"],246:["io"],248:["sc"],249:["sd"],250:["rw"],251:["et"],252:["so"],253:["dj"],254:["ke"],255:["tz"],256:["ug"],257:["bi"],258:["mz"],260:["zm"],261:["mg"],262:["re","yt"],263:["zw"],264:["na"],265:["mw"],266:["ls"],267:["bw"],268:["sz"],269:["km"],290:["sh"],291:["er"],297:["aw"],298:["fo"],299:["gl"],350:["gi"],351:["pt"],352:["lu"],353:["ie"],354:["is"],355:["al"],356:["mt"],357:["cy"],358:["fi","ax"],359:["bg"],370:["lt"],371:["lv"],372:["ee"],373:["md"],374:["am"],375:["by"],376:["ad"],377:["mc","xk"],378:["sm"],379:["va"],380:["ua"],381:["rs"],382:["me"],385:["hr"],386:["si"],387:["ba"],389:["mk"],420:["cz"],421:["sk"],423:["li"],500:["fk","gs"],501:["bz"],502:["gt"],503:["sv"],504:["hn"],505:["ni"],506:["cr"],507:["pa"],508:["pm"],509:["ht"],590:["gp","bl","mf"],591:["bo"],592:["gy"],593:["ec"],594:["gf"],595:["py"],596:["mq"],597:["sr"],598:["uy"],670:["tl"],672:["nf"],673:["bn"],674:["nr"],675:["pg"],676:["to"],677:["sb"],678:["vu"],679:["fj"],680:["pw"],681:["wf"],682:["ck"],683:["nu"],685:["ws"],686:["ki"],687:["nc"],688:["tv"],689:["pf"],690:["tk"],691:["fm"],692:["mh"],850:["kp"],852:["hk"],853:["mo"],855:["kh"],856:["la"],880:["bd"],886:["tw"],960:["mv"],961:["lb"],962:["jo"],963:["sy"],964:["iq"],965:["kw"],966:["sa"],967:["ye"],968:["om"],970:["ps"],971:["ae"],972:["il"],973:["bh"],974:["qa"],975:["bt"],976:["mn"],977:["np"],992:["tj"],993:["tm"],994:["az"],995:["ge"],996:["kg"],998:["uz"],1204:["ca"],1236:["ca"],1242:["bs"],1246:["bb"],1249:["ca"],1250:["ca"],1264:["ai"],1268:["ag"],1284:["vg"],1289:["ca"],1306:["ca"],1340:["vi"],1343:["ca"],1345:["ky"],1365:["ca"],1387:["ca"],1403:["ca"],1416:["ca"],1418:["ca"],1431:["ca"],1437:["ca"],1438:["ca"],1441:["bm"],1450:["ca"],1473:["gd"],1506:["ca"],1514:["ca"],1519:["ca"],1548:["ca"],1579:["ca"],1581:["ca"],1587:["ca"],1604:["ca"],1613:["ca"],1639:["ca"],1647:["ca"],1649:["tc"],1664:["ms"],1670:["mp"],1671:["gu"],1672:["ca"],1684:["as"],1705:["ca"],1709:["ca"],1721:["sx"],1742:["ca"],1758:["lc"],1767:["dm"],1778:["ca"],1780:["ca"],1782:["ca"],1784:["vc"],1787:["pr"],1807:["ca"],1809:["do"],1819:["ca"],1825:["ca"],1867:["ca"],1868:["tt"],1869:["kn"],1873:["ca"],1876:["jm"],1902:["ca"],1905:["ca"],4779:["sj"],5997:["bq"],5999:["cw"]}});
\ No newline at end of file
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],function(b){a(b,window,document)}):a(jQuery,window,document)}(function(a,b,c,d){"use strict";function e(b,c){this.element=b,this.options=a.extend({},h,c),this._defaults=h,this.ns="."+f+g++,this.isGoodBrowser=Boolean(b.setSelectionRange),this._name=f,this.init()}var f="intlTelInput",g=1,h={autoFormat:!0,autoHideDialCode:!0,defaultCountry:"",nationalMode:!1,onlyCountries:[],preferredCountries:["us","gb"],responsiveDropdown:!1,validationScript:""},i={UP:38,DOWN:40,ENTER:13,ESC:27,PLUS:43,A:65,Z:90,ZERO:48,NINE:57,SPACE:32,BACKSPACE:8,DELETE:46},j=!1;a(b).load(function(){j=!0}),e.prototype={init:function(){this.options.nationalMode&&(this.options.autoFormat=this.options.autoHideDialCode=!1),this._processCountryData(),this._generateMarkup(),this._setInitialState(),this._initListeners()},_processCountryData:function(){this._setInstanceCountryData(),this._setPreferredCountries()},_setInstanceCountryData:function(){var b=this;if(this.options.onlyCountries.length){var c,d,e=[],f={};for(d=0;d<this.options.onlyCountries.length;d++){var g=this.options.onlyCountries[d],h=b._getCountryData(g,!0,!1);h&&(e.push(h),c=h.dialCode,f[c]?f[c].push(g):f[c]=[g])}for(c in f)if(f[c].length>1){var i=[];for(d=0;d<n[c].length;d++){var j=n[c][d];a.inArray(f[c],j)&&i.push(j)}f[c]=i}this.countries=e,this.countryCodes=f}else this.countries=k,this.countryCodes=n},_setPreferredCountries:function(){var a=this;this.preferredCountries=[];for(var b=0;b<this.options.preferredCountries.length;b++){var c=this.options.preferredCountries[b],d=a._getCountryData(c,!1,!0);d&&a.preferredCountries.push(d)}},_generateMarkup:function(){this.telInput=a(this.element),this.telInput.wrap(a("<div>",{"class":"intl-tel-input"}));var b=a("<div>",{"class":"flag-dropdown"}).insertAfter(this.telInput),c=a("<div>",{"class":"selected-flag"}).appendTo(b);this.selectedFlagInner=a("<div>",{"class":"flag"}).appendTo(c),a("<div>",{"class":"arrow"}).appendTo(this.selectedFlagInner),this.countryList=a("<ul>",{"class":"country-list v-hide"}).appendTo(b),this.preferredCountries.length&&(this._appendListItems(this.preferredCountries,"preferred"),a("<li>",{"class":"divider"}).appendTo(this.countryList)),this._appendListItems(this.countries,""),this.dropdownHeight=this.countryList.outerHeight(),this.countryList.removeClass("v-hide").addClass("hide"),this.options.responsiveDropdown&&this.countryList.outerWidth(this.telInput.outerWidth()),this.countryListItems=this.countryList.children(".country")},_appendListItems:function(a,b){for(var c="",d=0;d<a.length;d++){var e=a[d];c+="<li class='country "+b+"' data-dial-code='"+e.dialCode+"' data-country-code='"+e.iso2+"'>",c+="<div class='flag "+e.iso2+"'></div>",c+="<span class='country-name'>"+e.name+"</span>",c+="<span class='dial-code'>+"+e.dialCode+"</span>",c+="</li>"}this.countryList.append(c)},_setInitialState:function(){if(!this.setNumber(this.telInput.val())){var a;a=this.options.defaultCountry?this._getCountryData(this.options.defaultCountry,!1,!1):this.preferredCountries.length?this.preferredCountries[0]:this.countries[0],this._selectFlag(a.iso2),this.options.autoHideDialCode||this._resetToDialCode(a.dialCode)}},_initListeners:function(){var d=this;this.options.autoHideDialCode&&this._initAutoHideDialCode();var e=this.telInput.closest("label");e.length&&e.on("click"+this.ns,function(a){d.countryList.hasClass("hide")?d.telInput.focus():a.preventDefault()}),this.options.autoFormat&&this.telInput.on("keypress"+this.ns,function(a){a.preventDefault();var b=a.which==i.PLUS||a.which>=i.ZERO&&a.which<=i.NINE;d._handleInputKey(a,!1,String.fromCharCode(a.which),b)}),this.telInput.on("keyup"+this.ns,function(a){d.options.autoFormat?(a.which==i.BACKSPACE||a.which==i.DELETE)&&d._handleInputKey(a,!0,"",!0):d.setNumber(d.telInput.val())});var f=this.selectedFlagInner.parent();if(f.on("click"+this.ns,function(){d.countryList.hasClass("hide")&&!d.telInput.prop("disabled")&&d._showDropdown()}),this.options.validationScript){var g=function(){var a=c.createElement("script");a.type="text/javascript",a.src=d.options.validationScript,c.body.appendChild(a)};j?g():a(b).load(g)}},_handleInputKey:function(a,b,c,d){var e=this.telInput.val(),f=null,g=!1,h=this.telInput[0];if(this.isGoodBrowser){var i=h.selectionStart,j=e.length;if(g=i==j,d){var k=h.selectionEnd;e=e.substring(0,i)+c+e.substring(k,j),k===j?g=!0:f=k+(e.length-j)}}else d&&(e+=c);(d||g)&&(this.setNumber(e,b),g&&(f=this.telInput.val().length),this.isGoodBrowser&&f&&h.setSelectionRange(f,f))},_initAutoHideDialCode:function(){var b=this;this.telInput.on("mousedown"+this.ns,function(a){b.telInput.is(":focus")||b.telInput.val()||(a.preventDefault(),b._focus())}),this.telInput.on("focus"+this.ns,function(){a.trim(b.telInput.val())||(b._updateVal("+"+b.selectedCountryData.dialCode,!0),b.telInput.one("keypress.plus"+b.ns,function(a){a.which==i.PLUS&&b.telInput.val("+")}))}),this.telInput.on("blur"+this.ns,function(){var c=b.telInput.val(),d="+"==c.substring(0,1),e=c.replace(/\D/g,"");d&&e&&(c="+"+e,a.trim(b._getDialCode(c))==c&&b.telInput.val("")),b.telInput.off("keypress.plus"+b.ns)})},_focus:function(){this.telInput.focus();var a=this.telInput[0];if(this.isGoodBrowser){var b=this.telInput.val().length;a.setSelectionRange(b,b)}},_showDropdown:function(){this._setDropdownPosition();var a=this.countryList.children(".active");this._highlightListItem(a),this.countryList.removeClass("hide"),this._scrollTo(a),this._bindDropdownListeners(),this.selectedFlagInner.children(".arrow").addClass("up")},_setDropdownPosition:function(){var c=this.telInput.offset().top,d=a(b).scrollTop(),e=c+this.telInput.outerHeight()+this.dropdownHeight<d+a(b).height(),f=c-this.dropdownHeight>d,g=!e&&f?"-"+(this.dropdownHeight-1)+"px":"";this.countryList.css("top",g)},_bindDropdownListeners:function(){var b=this;this.countryList.on("mouseover"+this.ns,".country",function(){b._highlightListItem(a(this))}),this.countryList.on("click"+this.ns,".country",function(){b._selectListItem(a(this))});var d=!0;a("html").on("click"+this.ns,function(){d||b._closeDropdown(),d=!1});var e="",f=null;a(c).on("keydown"+this.ns,function(a){a.preventDefault(),a.which==i.UP||a.which==i.DOWN?b._handleUpDownKey(a.which):a.which==i.ENTER?b._handleEnterKey():a.which==i.ESC?b._closeDropdown():(a.which>=i.A&&a.which<=i.Z||a.which==i.SPACE)&&(f&&clearTimeout(f),e+=String.fromCharCode(a.which),b._searchForCountry(e),f=setTimeout(function(){e=""},1e3))})},_handleUpDownKey:function(a){var b=this.countryList.children(".highlight").first(),c=a==i.UP?b.prev():b.next();c.length&&(c.hasClass("divider")&&(c=a==i.UP?c.prev():c.next()),this._highlightListItem(c),this._scrollTo(c))},_handleEnterKey:function(){var a=this.countryList.children(".highlight").first();a.length&&this._selectListItem(a)},_searchForCountry:function(a){for(var b=0;b<this.countries.length;b++)if(this._startsWith(this.countries[b].name,a)){var c=this.countryList.children("[data-country-code="+this.countries[b].iso2+"]").not(".preferred");this._highlightListItem(c),this._scrollTo(c,!0);break}},_startsWith:function(a,b){return a.substr(0,b.length).toUpperCase()==b},_updateVal:function(a,b,c){var d,e="";if(this.options.autoFormat){if(d=a.replace(/\D/g,""),b){var f=this.selectedCountryData.format;if(f)for(var g=0;g<f.length;g++)if("."==f[g]){if(!d)break;if(e+=d.substring(0,1),d=d.substring(1),!d&&c)break}else e+=f[g]}e||"+"!=a.substring(0,1)||(e="+")}else d=a;this.telInput.val(e+d)},_resetToDialCode:function(a){var b=this.options.nationalMode?"":"+"+a;this.telInput.val(b)},_highlightListItem:function(a){this.countryListItems.removeClass("highlight"),a.addClass("highlight")},_getCountryData:function(a,b,c){for(var d=b?k:this.countries,e=0;e<d.length;e++)if(d[e].iso2==a)return d[e];if(c)return null;throw new Error("No country data for '"+a+"'")},_selectFlag:function(a){this.selectedFlagInner.attr("class","flag "+a),this.selectedCountryData=this._getCountryData(a,!1,!1);var b=this.selectedCountryData.name+": +"+this.selectedCountryData.dialCode;this.selectedFlagInner.parent().attr("title",b);var c=this.countryListItems.children(".flag."+a).first().parent();this.countryListItems.removeClass("active"),c.addClass("active")},_selectListItem:function(a){var b=a.attr("data-country-code");this._selectFlag(b),this._closeDropdown(),this.options.nationalMode||(this._updateDialCode("+"+a.attr("data-dial-code")),this.telInput.trigger("change")),this._focus()},_closeDropdown:function(){this.countryList.addClass("hide"),this.selectedFlagInner.children(".arrow").removeClass("up"),a(c).off(this.ns),a("html").off(this.ns),this.countryList.off(this.ns)},_scrollTo:function(a,b){var c=this.countryList,d=c.height(),e=c.offset().top,f=e+d,g=a.outerHeight(),h=a.offset().top,i=h+g,j=h-e+c.scrollTop(),k=d/2-g/2;if(e>h)b&&(j-=k),c.scrollTop(j);else if(i>f){b&&(j+=k);var l=d-g;c.scrollTop(j-l)}},_updateDialCode:function(b){var c,d=this.telInput.val(),e=this._getDialCode(d);if(e.length>1)c=d.replace(e,b);else{var f=d&&"+"!=d.substr(0,1)?a.trim(d):"";c=b+f}this._updateVal(c,!0)},_getDialCode:function(b){var c="";if(b=a.trim(b),"+"==b.charAt(0))for(var d="",e=0;e<b.length;e++){var f=b.charAt(e);if(a.isNumeric(f)&&(d+=f,this.countryCodes[d]&&(c=b.substring(0,e+1)),4==d.length))break}return c},destroy:function(){this._closeDropdown(),this.telInput.off(this.ns),this.selectedFlagInner.parent().off(this.ns),this.telInput.closest("label").off(this.ns);var a=this.telInput.parent();a.before(this.telInput).remove()},getSelectedCountryData:function(){return this.selectedCountryData},isValidNumber:function(c){var d=a.trim(this.telInput.val()),e=c?this.selectedCountryData.iso2:"",f=/[a-zA-Z]/.test(d);return!f&&b.isValidNumber(d,e)},selectCountry:function(a){this.selectedFlagInner.hasClass(a)||(this._selectFlag(a),this.telInput.val()||this.options.autoHideDialCode||this._resetToDialCode(this.selectedCountryData.dialCode))},setNumber:function(a,b){var c=this,d=this._getDialCode(a);if(d){for(var e=this.countryCodes[d.replace(/\D/g,"")],f=!1,g=0;g<e.length;g++)c.selectedFlagInner.hasClass(e[g])&&(f=!0);f||this._selectFlag(e[0])}return this._updateVal(a,d,b),d}},a.fn[f]=function(b){var c=arguments;if(b===d||"object"==typeof b)return this.each(function(){a.data(this,"plugin_"+f)||a.data(this,"plugin_"+f,new e(this,b))});if("string"==typeof b&&"_"!==b[0]&&"init"!==b){var g;return this.each(function(){var d=a.data(this,"plugin_"+f);d instanceof e&&"function"==typeof d[b]&&(g=d[b].apply(d,Array.prototype.slice.call(c,1))),"destroy"===b&&a.data(this,"plugin_"+f,null)}),g!==d?g:this}},a.fn[f].getCountryData=function(){return k},a.fn[f].setCountryData=function(a){k=a};for(var k=[["Afghanistan (‫افغانستان‬‎)","af","93"],["Åland Islands (Åland)","ax","358","+... .. ... .. .."],["Albania (Shqipëri)","al","355"],["Algeria (‫الجزائر‬‎)","dz","213"],["American Samoa","as","1684"],["Andorra","ad","376"],["Angola","ao","244"],["Anguilla","ai","1264"],["Antigua and Barbuda","ag","1268"],["Argentina","ar","54"],["Armenia (Հայաստան)","am","374"],["Aruba","aw","297"],["Australia","au","61","+.. ... ... ..."],["Austria (Österreich)","at","43"],["Azerbaijan (Azərbaycan)","az","994"],["Bahamas","bs","1242"],["Bahrain (‫البحرين‬‎)","bh","973"],["Bangladesh (বাংলাদেশ)","bd","880"],["Barbados","bb","1246"],["Belarus (Беларусь)","by","375"],["Belgium (België)","be","32","+.. ... .. .. .."],["Belize","bz","501"],["Benin (Bénin)","bj","229"],["Bermuda","bm","1441"],["Bhutan (འབྲུག)","bt","975"],["Bolivia","bo","591"],["Bosnia and Herzegovina (Босна и Херцеговина)","ba","387"],["Botswana","bw","267"],["Brazil (Brasil)","br","55"],["British Indian Ocean Territory","io","246"],["British Virgin Islands","vg","1284"],["Brunei","bn","673"],["Bulgaria (България)","bg","359"],["Burkina Faso","bf","226"],["Burundi (Uburundi)","bi","257"],["Cambodia (កម្ពុជា)","kh","855"],["Cameroon (Cameroun)","cm","237"],["Canada","ca","1","+. (...) ...-...."],["Cape Verde (Kabu Verdi)","cv","238"],["Caribbean Netherlands","bq","5997"],["Cayman Islands","ky","1345"],["Central African Republic (République centrafricaine)","cf","236"],["Chad (Tchad)","td","235"],["Chile","cl","56"],["China (中国)","cn","86","+.. ..-........"],["Christmas Island","cx","61","+.. ... ... ..."],["Cocos (Keeling) Islands (Kepulauan Cocos (Keeling))","cc","61","+.. ... ... ..."],["Colombia","co","57"],["Comoros (‫جزر القمر‬‎)","km","269"],["Congo (DRC) (Jamhuri ya Kidemokrasia ya Kongo)","cd","243"],["Congo (Republic) (Congo-Brazzaville)","cg","242"],["Cook Islands","ck","682"],["Costa Rica","cr","506","+... ....-...."],["Côte d’Ivoire","ci","225"],["Croatia (Hrvatska)","hr","385"],["Cuba","cu","53"],["Curaçao","cw","5999"],["Cyprus (Κύπρος)","cy","357"],["Czech Republic (Česká republika)","cz","420"],["Denmark (Danmark)","dk","45","+.. .. .. .. .."],["Djibouti","dj","253"],["Dominica","dm","1767"],["Dominican Republic (República Dominicana)","do","1809"],["Ecuador","ec","593"],["Egypt (‫مصر‬‎)","eg","20"],["El Salvador","sv","503","+... ....-...."],["Equatorial Guinea (Guinea Ecuatorial)","gq","240"],["Eritrea","er","291"],["Estonia (Eesti)","ee","372"],["Ethiopia","et","251"],["Falkland Islands (Islas Malvinas)","fk","500"],["Faroe Islands (Føroyar)","fo","298"],["Fiji","fj","679"],["Finland (Suomi)","fi","358","+... .. ... .. .."],["France","fr","33","+.. . .. .. .. .."],["French Guiana (Guyane française)","gf","594"],["French Polynesia (Polynésie française)","pf","689"],["Gabon","ga","241"],["Gambia","gm","220"],["Georgia (საქართველო)","ge","995"],["Germany (Deutschland)","de","49","+.. ... ......."],["Ghana (Gaana)","gh","233"],["Gibraltar","gi","350"],["Greece (Ελλάδα)","gr","30"],["Greenland (Kalaallit Nunaat)","gl","299"],["Grenada","gd","1473"],["Guadeloupe","gp","590"],["Guam","gu","1671"],["Guatemala","gt","502","+... ....-...."],["Guernsey","gg","44","+.. .... ......"],["Guinea (Guinée)","gn","224"],["Guinea-Bissau (Guiné Bissau)","gw","245"],["Guyana","gy","592"],["Haiti","ht","509","+... ....-...."],["Honduras","hn","504"],["Hong Kong (香港)","hk","852","+... .... ...."],["Hungary (Magyarország)","hu","36"],["Iceland (Ísland)","is","354","+... ... ...."],["India (भारत)","in","91","+.. .....-....."],["Indonesia","id","62"],["Iran (‫ایران‬‎)","ir","98"],["Iraq (‫العراق‬‎)","iq","964"],["Ireland","ie","353","+... .. ......."],["Isle of Man","im","44","+.. .... ......"],["Israel (‫ישראל‬‎)","il","972"],["Italy (Italia)","it","39","+.. ... ......"],["Jamaica","jm","1876"],["Japan (日本)","jp","81","+.. ... .. ...."],["Jersey","je","44","+.. .... ......"],["Jordan (‫الأردن‬‎)","jo","962"],["Kazakhstan (Казахстан)","kz","7","+. ... ...-..-.."],["Kenya","ke","254"],["Kiribati","ki","686"],["Kosovo (Kosovë)","xk","377"],["Kuwait (‫الكويت‬‎)","kw","965"],["Kyrgyzstan (Кыргызстан)","kg","996"],["Laos (ລາວ)","la","856"],["Latvia (Latvija)","lv","371"],["Lebanon (‫لبنان‬‎)","lb","961"],["Lesotho","ls","266"],["Liberia","lr","231"],["Libya (‫ليبيا‬‎)","ly","218"],["Liechtenstein","li","423"],["Lithuania (Lietuva)","lt","370"],["Luxembourg","lu","352"],["Macau (澳門)","mo","853"],["Macedonia (FYROM) (Македонија)","mk","389"],["Madagascar (Madagasikara)","mg","261"],["Malawi","mw","265"],["Malaysia","my","60","+.. ..-....-...."],["Maldives","mv","960"],["Mali","ml","223"],["Malta","mt","356"],["Marshall Islands","mh","692"],["Martinique","mq","596"],["Mauritania (‫موريتانيا‬‎)","mr","222"],["Mauritius (Moris)","mu","230"],["Mayotte","yt","262"],["Mexico (México)","mx","52"],["Micronesia","fm","691"],["Moldova (Republica Moldova)","md","373"],["Monaco","mc","377"],["Mongolia (Монгол)","mn","976"],["Montenegro (Crna Gora)","me","382"],["Montserrat","ms","1664"],["Morocco (‫المغرب‬‎)","ma","212"],["Mozambique (Moçambique)","mz","258"],["Myanmar (Burma) (မြန်မာ)","mm","95"],["Namibia (Namibië)","na","264"],["Nauru","nr","674"],["Nepal (नेपाल)","np","977"],["Netherlands (Nederland)","nl","31","+.. .. ........"],["New Caledonia (Nouvelle-Calédonie)","nc","687"],["New Zealand","nz","64","+.. ...-...-...."],["Nicaragua","ni","505"],["Niger (Nijar)","ne","227"],["Nigeria","ng","234"],["Niue","nu","683"],["Norfolk Island","nf","672"],["North Korea (조선 민주주의 인민 공화국)","kp","850"],["Northern Mariana Islands","mp","1670"],["Norway (Norge)","no","47","+.. ... .. ..."],["Oman (‫عُمان‬‎)","om","968"],["Pakistan (‫پاکستان‬‎)","pk","92","+.. ...-......."],["Palau","pw","680"],["Palestine (‫فلسطين‬‎)","ps","970"],["Panama (Panamá)","pa","507"],["Papua New Guinea","pg","675"],["Paraguay","py","595"],["Peru (Perú)","pe","51"],["Philippines","ph","63","+.. ... ...."],["Pitcairn Islands","pn","64","+.. ...-...-...."],["Poland (Polska)","pl","48","+.. ...-...-..."],["Portugal","pt","351"],["Puerto Rico","pr","1787"],["Qatar (‫قطر‬‎)","qa","974"],["Réunion (La Réunion)","re","262"],["Romania (România)","ro","40"],["Russia (Россия)","ru","7","+. ... ...-..-.."],["Rwanda","rw","250"],["Saint Barthélemy (Saint-Barthélemy)","bl","590"],["Saint Helena","sh","290"],["Saint Kitts and Nevis","kn","1869"],["Saint Lucia","lc","1758"],["Saint Martin (Saint-Martin (partie française))","mf","590"],["Saint Pierre and Miquelon (Saint-Pierre-et-Miquelon)","pm","508"],["Saint Vincent and the Grenadines","vc","1784"],["Samoa","ws","685"],["San Marino","sm","378"],["São Tomé and Príncipe (São Tomé e Príncipe)","st","239"],["Saudi Arabia (‫المملكة العربية السعودية‬‎)","sa","966"],["Senegal (Sénégal)","sn","221"],["Serbia (Србија)","rs","381"],["Seychelles","sc","248"],["Sierra Leone","sl","232"],["Singapore","sg","65","+.. ....-...."],["Sint Maarten","sx","1721"],["Slovakia (Slovensko)","sk","421"],["Slovenia (Slovenija)","si","386"],["Solomon Islands","sb","677"],["Somalia (Soomaaliya)","so","252"],["South Africa","za","27"],["South Georgia & South Sandwich Islands","gs","500"],["South Korea (대한민국)","kr","82"],["South Sudan (‫جنوب السودان‬‎)","ss","211"],["Spain (España)","es","34","+.. ... ... ..."],["Sri Lanka (ශ්‍රී ලංකාව)","lk","94"],["Sudan (‫السودان‬‎)","sd","249"],["Suriname","sr","597"],["Svalbard and Jan Mayen (Svalbard og Jan Mayen)","sj","4779"],["Swaziland","sz","268"],["Sweden (Sverige)","se","46"],["Switzerland (Schweiz)","ch","41","+.. .. ... .. .."],["Syria (‫سوريا‬‎)","sy","963"],["Taiwan (台灣)","tw","886"],["Tajikistan","tj","992"],["Tanzania","tz","255"],["Thailand (ไทย)","th","66"],["Timor-Leste","tl","670"],["Togo","tg","228"],["Tokelau","tk","690"],["Tonga","to","676"],["Trinidad and Tobago","tt","1868"],["Tunisia (‫تونس‬‎)","tn","216"],["Turkey (Türkiye)","tr","90","+.. ... ... .. .."],["Turkmenistan","tm","993"],["Turks and Caicos Islands","tc","1649"],["Tuvalu","tv","688"],["Uganda","ug","256"],["Ukraine (Україна)","ua","380"],["United Arab Emirates (‫الإمارات العربية المتحدة‬‎)","ae","971"],["United Kingdom","gb","44","+.. .... ......"],["United States","us","1","+. (...) ...-...."],["U.S. Virgin Islands","vi","1340"],["Uruguay","uy","598"],["Uzbekistan (Oʻzbekiston)","uz","998"],["Vanuatu","vu","678"],["Vatican City (Città del Vaticano)","va","379"],["Venezuela","ve","58"],["Vietnam (Việt Nam)","vn","84"],["Wallis and Futuna","wf","681"],["Western Sahara (‫الصحراء الغربية‬‎)","eh","212"],["Yemen (‫اليمن‬‎)","ye","967"],["Zambia","zm","260"],["Zimbabwe","zw","263"]],l=0;l<k.length;l++){var m=k[l];k[l]={name:m[0],iso2:m[1],dialCode:m[2]},m[3]&&(k[l].format=m[3])}var n={1:["us","ca"],7:["ru","kz"],20:["eg"],27:["za"],30:["gr"],31:["nl"],32:["be"],33:["fr"],34:["es"],36:["hu"],39:["it"],40:["ro"],41:["ch"],43:["at"],44:["gb","gg","im","je"],45:["dk"],46:["se"],47:["no"],48:["pl"],49:["de"],51:["pe"],52:["mx"],53:["cu"],54:["ar"],55:["br"],56:["cl"],57:["co"],58:["ve"],60:["my"],61:["au","cc","cx"],62:["id"],63:["ph"],64:["nz","pn"],65:["sg"],66:["th"],81:["jp"],82:["kr"],84:["vn"],86:["cn"],90:["tr"],91:["in"],92:["pk"],93:["af"],94:["lk"],95:["mm"],98:["ir"],211:["ss"],212:["ma","eh"],213:["dz"],216:["tn"],218:["ly"],220:["gm"],221:["sn"],222:["mr"],223:["ml"],224:["gn"],225:["ci"],226:["bf"],227:["ne"],228:["tg"],229:["bj"],230:["mu"],231:["lr"],232:["sl"],233:["gh"],234:["ng"],235:["td"],236:["cf"],237:["cm"],238:["cv"],239:["st"],240:["gq"],241:["ga"],242:["cg"],243:["cd"],244:["ao"],245:["gw"],246:["io"],248:["sc"],249:["sd"],250:["rw"],251:["et"],252:["so"],253:["dj"],254:["ke"],255:["tz"],256:["ug"],257:["bi"],258:["mz"],260:["zm"],261:["mg"],262:["re","yt"],263:["zw"],264:["na"],265:["mw"],266:["ls"],267:["bw"],268:["sz"],269:["km"],290:["sh"],291:["er"],297:["aw"],298:["fo"],299:["gl"],350:["gi"],351:["pt"],352:["lu"],353:["ie"],354:["is"],355:["al"],356:["mt"],357:["cy"],358:["fi","ax"],359:["bg"],370:["lt"],371:["lv"],372:["ee"],373:["md"],374:["am"],375:["by"],376:["ad"],377:["mc","xk"],378:["sm"],379:["va"],380:["ua"],381:["rs"],382:["me"],385:["hr"],386:["si"],387:["ba"],389:["mk"],420:["cz"],421:["sk"],423:["li"],500:["fk","gs"],501:["bz"],502:["gt"],503:["sv"],504:["hn"],505:["ni"],506:["cr"],507:["pa"],508:["pm"],509:["ht"],590:["gp","bl","mf"],591:["bo"],592:["gy"],593:["ec"],594:["gf"],595:["py"],596:["mq"],597:["sr"],598:["uy"],670:["tl"],672:["nf"],673:["bn"],674:["nr"],675:["pg"],676:["to"],677:["sb"],678:["vu"],679:["fj"],680:["pw"],681:["wf"],682:["ck"],683:["nu"],685:["ws"],686:["ki"],687:["nc"],688:["tv"],689:["pf"],690:["tk"],691:["fm"],692:["mh"],850:["kp"],852:["hk"],853:["mo"],855:["kh"],856:["la"],880:["bd"],886:["tw"],960:["mv"],961:["lb"],962:["jo"],963:["sy"],964:["iq"],965:["kw"],966:["sa"],967:["ye"],968:["om"],970:["ps"],971:["ae"],972:["il"],973:["bh"],974:["qa"],975:["bt"],976:["mn"],977:["np"],992:["tj"],993:["tm"],994:["az"],995:["ge"],996:["kg"],998:["uz"],1204:["ca"],1236:["ca"],1242:["bs"],1246:["bb"],1249:["ca"],1250:["ca"],1264:["ai"],1268:["ag"],1284:["vg"],1289:["ca"],1306:["ca"],1340:["vi"],1343:["ca"],1345:["ky"],1365:["ca"],1387:["ca"],1403:["ca"],1416:["ca"],1418:["ca"],1431:["ca"],1437:["ca"],1438:["ca"],1441:["bm"],1450:["ca"],1473:["gd"],1506:["ca"],1514:["ca"],1519:["ca"],1548:["ca"],1579:["ca"],1581:["ca"],1587:["ca"],1604:["ca"],1613:["ca"],1639:["ca"],1647:["ca"],1649:["tc"],1664:["ms"],1670:["mp"],1671:["gu"],1672:["ca"],1684:["as"],1705:["ca"],1709:["ca"],1721:["sx"],1742:["ca"],1758:["lc"],1767:["dm"],1778:["ca"],1780:["ca"],1782:["ca"],1784:["vc"],1787:["pr"],1807:["ca"],1809:["do"],1819:["ca"],1825:["ca"],1867:["ca"],1868:["tt"],1869:["kn"],1873:["ca"],1876:["jm"],1902:["ca"],1905:["ca"],4779:["sj"],5997:["bq"],5999:["cw"]}});
\ No newline at end of file
diff --git a/src/js/intlTelInput.js b/src/js/intlTelInput.js
index 5e7a2d225..058aea744 100644
--- a/src/js/intlTelInput.js
+++ b/src/js/intlTelInput.js
@@ -334,39 +334,48 @@
     },
 
 
-    // handle a key event on the input - deals with replacing any currently selected chars, and formatting
+    // handle a key event on the input - deals with replacing any currently selected chars, and then formatting and then putting the cursor back in the right place
     _handleInputKey: function(e, isDelete, newChar, isAllowed) {
       var val = this.telInput.val(),
-        newCaretStart = null,
-        newCaretEnd = null,
+        newCursor = null,
+        cursorAtEnd = false,
         // raw DOM element
         input = this.telInput[0];
       
-      if (isAllowed) {
-        if (this.isGoodBrowser) {
-          var selectionEnd = input.selectionEnd,
-            originalLen = val.length;
+      if (this.isGoodBrowser) {
+        var selectionStart = input.selectionStart,
+          originalLen = val.length;
+        // at this point, cursorAtEnd should be false even if selectionEnd is at the end, because if isAllowed is false, we wont be replacing the selection
+        cursorAtEnd = (selectionStart == originalLen);
+
+        if (isAllowed) {
+          var selectionEnd = input.selectionEnd;
           // replace any selection they may have made with the new char
-          val = val.substring(0, input.selectionStart) + newChar + val.substring(selectionEnd, val.length);
-          // if the cursor/end of selection was not at the end, calculate the newCaretPos
-          if (input.selectionEnd !== originalLen) {
-            newCaretStart = newCaretEnd = selectionEnd + (val.length - originalLen);
+          val = val.substring(0, selectionStart) + newChar + val.substring(selectionEnd, originalLen);
+          // if the cursor/end of selection was at the end, we will make sure it's there afterwards
+          // else calculate the newCursor position
+          if (selectionEnd === originalLen) {
+            cursorAtEnd = true;
+          } else {
+            newCursor = selectionEnd + (val.length - originalLen);
           }
-        } else {
-          val += newChar;
         }
-      } else if (this.isGoodBrowser) {
-        // if not an allowed char, preserve their selection
-        newCaretStart = input.selectionStart;
-        newCaretEnd = input.selectionEnd;
+      } else if (isAllowed) {
+        val += newChar;
       }
 
-      // still re-format the number even if key is not allowed as may need to add formatting suffix
-      this.setNumber(val, isDelete);
+      // if the cursor is at the end, then always trigger a reformat as may want to add extra formatting suffix
+      if (isAllowed || cursorAtEnd) {
+        // update the number and flag
+        this.setNumber(val, isDelete);
 
-      // update the caret position
-      if (this.isGoodBrowser && newCaretStart) {
-        input.setSelectionRange(newCaretStart, newCaretEnd);
+        // update the cursor position
+        if (cursorAtEnd) {
+          newCursor = this.telInput.val().length;
+        }
+        if (this.isGoodBrowser && newCursor) {
+          input.setSelectionRange(newCursor, newCursor);
+        }
       }
     },
 
diff --git a/src/spec/helpers/helpers.js b/src/spec/helpers/helpers.js
index 0a882473a..0d11b1cf4 100644
--- a/src/spec/helpers/helpers.js
+++ b/src/spec/helpers/helpers.js
@@ -7,13 +7,6 @@ var input,
     DOWN: 40,
     ENTER: 13,
     ESC: 27,
-    PLUS: 43,
-    A: 65,
-    I: 73,
-    Z: 90,
-    ZERO: 48,
-    NINE: 57,
-    SPACE: 32,
     BACKSPACE: 8,
     DELETE: 46
   };
@@ -76,7 +69,7 @@ var putCursorAtEnd = function() {
 
 var getKeyEvent = function(key, type) {
   return $.Event(type, {
-    which: keyCodes[key]
+    which: (key.length > 1) ? keyCodes[key] : key.charCodeAt(0)
   });
 };
 
diff --git a/src/spec/tests/options/autoFormat.js b/src/spec/tests/options/autoFormat.js
index 99be3b4bb..2bd47caea 100644
--- a/src/spec/tests/options/autoFormat.js
+++ b/src/spec/tests/options/autoFormat.js
@@ -54,11 +54,57 @@ describe("testing autoFormat option", function() {
     });
 
     it("triggering alpha key at end of input does not add the alpha char and formats the rest", function() {
-      // updating the input value will be silent (no events triggered)
-      input.val(unformattedNumber + "A");
+      // we dont have to manually alter the input val as when autoFormat is enabled this is all done in the event handler
+      putCursorAtEnd();
       triggerKeyOnInput("A");
       expect(input.val()).toEqual(formattedNumber);
     });
+
+
+
+
+    it("adding a digit automatically adds any formatting suffix", function() {
+      input.val("+");
+      putCursorAtEnd();
+      // this is handled by the keypress handler, and so will insert the char for you
+      triggerKeyOnInput("1");
+      expect(input.val()).toEqual("+1 (");
+    });
+
+    it("deleting a digit automatically removes any remaining formatting suffix", function() {
+      // backspace key event is handled by the keyup handler, which expects the input val to already be updated, so instead of "+1 (7", I have already removed the 7
+      input.val("+1 (");
+      putCursorAtEnd();
+      triggerKeyOnInput("BACKSPACE");
+      expect(input.val()).toEqual("+1");
+    });
+
+
+
+
+    describe("after deleting a char and it removing any format suffix", function() {
+    
+      beforeEach(function() {
+        // e.g. imagine it was "+1 (7" and we deleted the 7 and it auto-removed the rest
+        input.val("+1");
+        putCursorAtEnd();
+      });
+    
+      it("hitting a number will re-add the formatting in between", function() {
+        // this is handled by the keypress handler, and so will insert the char for you
+        triggerKeyOnInput("7");
+        expect(input.val()).toEqual("+1 (7");
+      });
+
+      it("hitting any non-number char (e.g. a space) will re-add the formatting suffix", function() {
+        // this is handled by the keypress handler, and so will insert the char for you
+        triggerKeyOnInput(" ");
+        expect(input.val()).toEqual("+1 (");
+        // and move the cursor to the end
+        expect(input[0].selectionStart).toEqual(input.val().length);
+      });
+
+    });
   
   });