diff --git a/src/app/services/importService.js b/src/app/services/importService.js
index 9b0205a6fe8..3b13ddbbc1c 100644
--- a/src/app/services/importService.js
+++ b/src/app/services/importService.js
@@ -1673,13 +1673,10 @@
                                             break;
                                         case 'none':
                                         default:
-                                            var normalizedLabel = field.label.toLowerCase();
-                                            if (!site.username &&
-                                                (normalizedLabel === 'email' || normalizedLabel === 'username')) {
+                                            if (!site.username && isField(field.label, _usernameFieldNames)) {
                                                 site.username = field.value;
                                             }
-                                            else if (!site.password &&
-                                                (normalizedLabel === 'password' || normalizedLabel === 'pw')) {
+                                            else if (!site.password && isField(field.label, _passwordFieldNames)) {
                                                 site.password = field.value;
                                             }
                                             else {