diff --git a/src/ui/input/select_input.jsx b/src/ui/input/select_input.jsx
index 5fab5dcb8..2ed8c68de 100644
--- a/src/ui/input/select_input.jsx
+++ b/src/ui/input/select_input.jsx
@@ -52,11 +52,11 @@ export default class SelectInput extends React.Component {
       icon = <img className="auth0-lock-custom-icon" alt={ariaLabel || name} src={iconUrl} />;
     }
 
-    let className = 'auth0-lock-input auth0-lock-input-location';
+    let className = `auth0-lock-input auth0-lock-input-${name}`;
     if (!label) className += ' auth0-lock-input-with-placeholder';
 
     return (
-      <InputWrap focused={focused} isValid={isValid} name="location" icon={icon}>
+      <InputWrap focused={focused} isValid={isValid} name={name} icon={icon}>
         <input
           id={`${lockId}-${name}`}
           type="button"