diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -84,6 +84,19 @@
 <!--0BA24B8217B04C7DBCCFE0DEAF498679-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--0BA24B8217B04C7DBCCFE0DEAF498679--></AD_MESSAGE>
 
+<!--0D7FDBB45051473A8245CB21A6039F38--><AD_MESSAGE>
+<!--0D7FDBB45051473A8245CB21A6039F38-->  <AD_MESSAGE_ID><![CDATA[0D7FDBB45051473A8245CB21A6039F38]]></AD_MESSAGE_ID>
+<!--0D7FDBB45051473A8245CB21A6039F38-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0D7FDBB45051473A8245CB21A6039F38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0D7FDBB45051473A8245CB21A6039F38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0D7FDBB45051473A8245CB21A6039F38-->  <VALUE><![CDATA[OBMOBC_NotTerminalOrNotUser]]></VALUE>
+<!--0D7FDBB45051473A8245CB21A6039F38-->  <MSGTEXT><![CDATA[There are no users for the %0 terminal or the terminal does not exist.
+Please contact the system administrator.]]></MSGTEXT>
+<!--0D7FDBB45051473A8245CB21A6039F38-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--0D7FDBB45051473A8245CB21A6039F38-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--0D7FDBB45051473A8245CB21A6039F38-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--0D7FDBB45051473A8245CB21A6039F38--></AD_MESSAGE>
+
 <!--0EE7DA62B0AE4F3CA99837B1CD8FD1F7--><AD_MESSAGE>
 <!--0EE7DA62B0AE4F3CA99837B1CD8FD1F7-->  <AD_MESSAGE_ID><![CDATA[0EE7DA62B0AE4F3CA99837B1CD8FD1F7]]></AD_MESSAGE_ID>
 <!--0EE7DA62B0AE4F3CA99837B1CD8FD1F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -888,6 +901,18 @@
 <!--C4BC9A9586804E1DB5F6F373102A45BB-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--C4BC9A9586804E1DB5F6F373102A45BB--></AD_MESSAGE>
 
+<!--C4E1B578B13840ADA3BC8092798E743A--><AD_MESSAGE>
+<!--C4E1B578B13840ADA3BC8092798E743A-->  <AD_MESSAGE_ID><![CDATA[C4E1B578B13840ADA3BC8092798E743A]]></AD_MESSAGE_ID>
+<!--C4E1B578B13840ADA3BC8092798E743A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C4E1B578B13840ADA3BC8092798E743A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C4E1B578B13840ADA3BC8092798E743A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C4E1B578B13840ADA3BC8092798E743A-->  <VALUE><![CDATA[OBMOBC_InvalidUserPassword]]></VALUE>
+<!--C4E1B578B13840ADA3BC8092798E743A-->  <MSGTEXT><![CDATA[Invalid user name or password. Please try again.]]></MSGTEXT>
+<!--C4E1B578B13840ADA3BC8092798E743A-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--C4E1B578B13840ADA3BC8092798E743A-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--C4E1B578B13840ADA3BC8092798E743A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--C4E1B578B13840ADA3BC8092798E743A--></AD_MESSAGE>
+
 <!--C88B6F2C58B3477BAEA816BF54559E50--><AD_MESSAGE>
 <!--C88B6F2C58B3477BAEA816BF54559E50-->  <AD_MESSAGE_ID><![CDATA[C88B6F2C58B3477BAEA816BF54559E50]]></AD_MESSAGE_ID>
 <!--C88B6F2C58B3477BAEA816BF54559E50-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1116,17 +1141,4 @@
 <!--FED607CB920046AEAD41C88670FDE09F-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--FED607CB920046AEAD41C88670FDE09F--></AD_MESSAGE>
 
-<!--0D7FDBB45051473A8245CB21A6039F38--><AD_MESSAGE>
-<!--0D7FDBB45051473A8245CB21A6039F38-->  <AD_MESSAGE_ID><![CDATA[0D7FDBB45051473A8245CB21A6039F38]]></AD_MESSAGE_ID>
-<!--0D7FDBB45051473A8245CB21A6039F38-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0D7FDBB45051473A8245CB21A6039F38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0D7FDBB45051473A8245CB21A6039F38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0D7FDBB45051473A8245CB21A6039F38-->  <VALUE><![CDATA[OBMOBC_NotTerminalOrNotUser]]></VALUE>
-<!--0D7FDBB45051473A8245CB21A6039F38-->  <MSGTEXT><![CDATA[There are no users for the %0 terminal or the terminal does not exist.
-Please contact the system administrator.]]></MSGTEXT>
-<!--0D7FDBB45051473A8245CB21A6039F38-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--0D7FDBB45051473A8245CB21A6039F38-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
-<!--0D7FDBB45051473A8245CB21A6039F38-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--0D7FDBB45051473A8245CB21A6039F38--></AD_MESSAGE>
-
 </data>
diff --git a/web/org.openbravo.mobile.core/source/component/ob-login.js b/web/org.openbravo.mobile.core/source/component/ob-login.js
--- a/web/org.openbravo.mobile.core/source/component/ob-login.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-login.js
@@ -307,7 +307,7 @@
     var u = this.$.username.getValue(),
         p = this.$.password.getValue();
     if (!u || !p) {
-      alert('Please enter your username and password');
+      OB.UTIL.showWarning(OB.I18N.getLabel('OBMOBC_EmptyUserPassword'));
     } else {
       OB.MobileApp.model.login(u, p);
     }
@@ -364,7 +364,7 @@
     if (name.length === 0) {
       this.$.loginInputsContainer.hide();
       this.$.loginHeaderCompany.hide();
-      alert(OB.I18N.getLabel('OBMOBC_NotTerminalOrNotUser', [OB.MobileApp.model.get('terminalName')]));
+      OB.UTIL.showConfirmation.display('', OB.I18N.getLabel('OBMOBC_NotTerminalOrNotUser', [OB.MobileApp.model.get('terminalName')]));
     }
     for (i = 0; i < name.length; i++) {
       target.createComponent({
@@ -391,8 +391,8 @@
       if (data && data.messageText) {
         msg += (msg ? '\n' : '') + data.messageText;
       }
-      msg = msg || 'Invalid user name or password.\nPlease try again.';
-      alert(msg);
+      msg = msg || OB.I18N.getLabel('OBMOBC_InvalidUserPassword');
+      OB.UTIL.showConfirmation.display('', msg);
       if (this.$.password) {
         this.$.password.setValue('');
       }
diff --git a/web/org.openbravo.mobile.core/source/component/obpos-approval.js b/web/org.openbravo.mobile.core/source/component/obpos-approval.js
--- a/web/org.openbravo.mobile.core/source/component/obpos-approval.js
+++ b/web/org.openbravo.mobile.core/source/component/obpos-approval.js
@@ -209,11 +209,11 @@
         p = this.$.bodyContent.$.password.getValue();
 
     if (!u || !p) {
-      alert(OB.I18N.getLabel('OBMOBC_EmptyUserPassword'));
+      OB.UTIL.showWarning(OB.I18N.getLabel('OBMOBC_EmptyUserPassword'));
     } else {
       this.model.checkApproval(this.approvalType, u, p, this.callback);
-      this.waterfall('onHideThisPopup', {});
     }
+    this.waterfall('onHideThisPopup', {});
   }
 });
 
diff --git a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
@@ -1001,8 +1001,11 @@
     }, function (users) {
       var user;
       if (users.models.length === 0) {
-        alert(OB.I18N.getLabel('OBMOBC_OfflinePasswordNotCorrect'));
-        window.location.reload();
+        OB.UTIL.showConfirmation.display('', OB.I18N.getLabel('OBMOBC_OfflinePasswordNotCorrect'), null, {
+          onHideFunction: function () {
+            window.location.reload();
+          }
+        });
       } else {
         if (users.models[0].get('password') === me.generate_sha1(me.password + users.models[0].get('created'))) {
           me.usermodel = users.models[0];
@@ -1010,8 +1013,11 @@
           me.updateSession(me.usermodel);
           me.renderTerminalMain();
         } else {
-          alert(OB.I18N.getLabel('OBMOBC_OfflinePasswordNotCorrect'));
-          window.location.reload();
+          OB.UTIL.showConfirmation.display('', OB.I18N.getLabel('OBMOBC_OfflinePasswordNotCorrect'), null, {
+            onHideFunction: function () {
+              window.location.reload();
+            }
+          });
         }
       }
     }, function () {});