diff --git a/app/partials/desktop/username_edit_modal.html b/app/partials/desktop/username_edit_modal.html
index fb9dbd09..1e877755 100644
--- a/app/partials/desktop/username_edit_modal.html
+++ b/app/partials/desktop/username_edit_modal.html
@@ -9,7 +9,7 @@
       <h4 my-i18n="username_edit_modal_title"></h4>
 
       <div class="form-group import_modal_field_wrap" ng-class="{'has-error': checked.error, 'has-feedback': checked.feedback.length > 0, 'has-success': checked.success}">
-        <input class="form-control input-md" my-focused type="text" placeholder="{{'username_edit_placeholder' | i18n}}" ng-model="profile.username"  name="username" ng-model-options="{debounce: 600}"/>
+        <input class="form-control input-md" my-focused type="text" placeholder="{{'username_edit_placeholder' | i18n}}" ng-model="profile.username"  name="username" ng-model-options="{updateOn: 'default blur', debounce: {default: 600, blur: 0}}"/>
         <span ng-if="checked.error" class="glyphicon form-control-feedback" ng-class="{'glyphicon-remove': checked.error}"></span>
       </div>
 
diff --git a/app/partials/mobile/username_edit_modal.html b/app/partials/mobile/username_edit_modal.html
index 0f222166..52791e80 100644
--- a/app/partials/mobile/username_edit_modal.html
+++ b/app/partials/mobile/username_edit_modal.html
@@ -31,7 +31,7 @@
     <form class="modal_simple_form" ng-submit="updateUsername()" my-vertical-position="0.3">
 
       <div class="form-group import_modal_field_wrap" ng-class="{'has-error': checked.error, 'has-feedback': checked.feedback.length > 0, 'has-success': checked.success}">
-        <input class="form-control input-md" my-focused type="text" placeholder="{{'username_edit_placeholder' | i18n}}" ng-model="profile.username"  name="username" ng-model-options="{debounce: 600}"/>
+        <input class="form-control input-md" my-focused type="text" placeholder="{{'username_edit_placeholder' | i18n}}" ng-model="profile.username"  name="username" ng-model-options="{updateOn: 'default blur', debounce: {default: 600, blur: 0}}"/>
         <span ng-if="checked.error" class="glyphicon form-control-feedback" ng-class="{'glyphicon-remove': checked.error}"></span>
       </div>