diff --git a/frontend/src/AddArtist/AddNewArtist/AddNewArtist.css b/frontend/src/AddArtist/AddNewArtist/AddNewArtist.css
index c1ec4fbe3..0bf8b0e15 100644
--- a/frontend/src/AddArtist/AddNewArtist/AddNewArtist.css
+++ b/frontend/src/AddArtist/AddNewArtist/AddNewArtist.css
@@ -17,7 +17,7 @@
 }
 
 .searchInput {
-  composes: text from 'Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   height: 46px;
   border-radius: 0;
diff --git a/frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSelectArtist.css b/frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSelectArtist.css
index c5023c00d..1a7f4836e 100644
--- a/frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSelectArtist.css
+++ b/frontend/src/AddArtist/ImportArtist/Import/SelectArtist/ImportArtistSelectArtist.css
@@ -64,7 +64,7 @@
 }
 
 .searchInput {
-  composes: text from 'Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   border-radius: 0;
 }
diff --git a/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css b/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css
index 12047c80d..fd56a4917 100644
--- a/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css
+++ b/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css
@@ -3,7 +3,7 @@
 }
 
 .numberInput {
-  composes: text from 'Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   margin-right: 3px;
 }
diff --git a/frontend/src/Components/Form/PasswordInput.css b/frontend/src/Components/Form/PasswordInput.css
new file mode 100644
index 000000000..fca96bea9
--- /dev/null
+++ b/frontend/src/Components/Form/PasswordInput.css
@@ -0,0 +1,5 @@
+.input {
+  composes: input from 'Components/Form/TextInput.css';
+
+  font-family: $passwordFamily;
+}
diff --git a/frontend/src/Components/Form/PasswordInput.js b/frontend/src/Components/Form/PasswordInput.js
index 2560ce3c2..adb1e7c5a 100644
--- a/frontend/src/Components/Form/PasswordInput.js
+++ b/frontend/src/Components/Form/PasswordInput.js
@@ -1,13 +1,22 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import TextInput from './TextInput';
+import styles from './PasswordInput.css';
 
 function PasswordInput(props) {
   return (
     <TextInput
-      type="password"
       {...props}
     />
   );
 }
 
+PasswordInput.propTypes = {
+  className: PropTypes.string.isRequired
+};
+
+PasswordInput.defaultProps = {
+  className: styles.input
+};
+
 export default PasswordInput;
diff --git a/frontend/src/Components/Form/TextInput.css b/frontend/src/Components/Form/TextInput.css
index 25278adbc..7fb9f68cc 100644
--- a/frontend/src/Components/Form/TextInput.css
+++ b/frontend/src/Components/Form/TextInput.css
@@ -1,4 +1,4 @@
-.text {
+.input {
   composes: input from 'Components/Form/Input.css';
 }
 
diff --git a/frontend/src/Components/Form/TextInput.js b/frontend/src/Components/Form/TextInput.js
index e3a5b2c9f..92c0f4baf 100644
--- a/frontend/src/Components/Form/TextInput.js
+++ b/frontend/src/Components/Form/TextInput.js
@@ -24,6 +24,10 @@ class TextInput extends Component {
 
   componentWillUnmount() {
     window.removeEventListener('mouseup', this.onDocumentMouseUp);
+
+    if (this._selectionTimeout) {
+      this._selectionTimeout = clearTimeout(this._selectionTimeout);
+    }
   }
 
   //
@@ -171,7 +175,7 @@ TextInput.propTypes = {
 };
 
 TextInput.defaultProps = {
-  className: styles.text,
+  className: styles.input,
   type: 'text',
   readOnly: false,
   autoFocus: false,
diff --git a/frontend/src/Content/Fonts/fonts.css b/frontend/src/Content/Fonts/fonts.css
index 483c61ca8..5b44dfe1e 100644
--- a/frontend/src/Content/Fonts/fonts.css
+++ b/frontend/src/Content/Fonts/fonts.css
@@ -25,3 +25,15 @@
   font-family: 'Ubuntu Mono';
   src: url('UbuntuMono-Regular.eot?#iefix') format('embedded-opentype'), url('UbuntuMono-Regular.woff') format('woff'), url('UbuntuMono-Regular.ttf') format('truetype');
 }
+
+/*
+ * text-security-disc
+ */
+
+@font-face {
+  font-weight: normal;
+  font-style: normal;
+  font-family: 'text-security-disc';
+  src: url('text-security-disc.woff') format('woff'), url('text-security-disc.ttf') format('truetype');
+}
+
diff --git a/frontend/src/Content/Fonts/text-security-disc.ttf b/frontend/src/Content/Fonts/text-security-disc.ttf
new file mode 100644
index 000000000..86038dba8
Binary files /dev/null and b/frontend/src/Content/Fonts/text-security-disc.ttf differ
diff --git a/frontend/src/Content/Fonts/text-security-disc.woff b/frontend/src/Content/Fonts/text-security-disc.woff
new file mode 100644
index 000000000..bc4cc324b
Binary files /dev/null and b/frontend/src/Content/Fonts/text-security-disc.woff differ
diff --git a/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.css b/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.css
index d297be072..c22d502f5 100644
--- a/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.css
+++ b/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.css
@@ -7,7 +7,7 @@
 }
 
 .filterInput {
-  composes: text from 'Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   flex: 0 0 auto;
   margin-bottom: 20px;
diff --git a/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.css b/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.css
index d297be072..c22d502f5 100644
--- a/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.css
+++ b/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.css
@@ -7,7 +7,7 @@
 }
 
 .filterInput {
-  composes: text from 'Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   flex: 0 0 auto;
   margin-bottom: 20px;
diff --git a/frontend/src/Settings/MediaManagement/Naming/Naming.css b/frontend/src/Settings/MediaManagement/Naming/Naming.css
index a0fbf7f19..da27e292e 100644
--- a/frontend/src/Settings/MediaManagement/Naming/Naming.css
+++ b/frontend/src/Settings/MediaManagement/Naming/Naming.css
@@ -1,5 +1,5 @@
 .namingInput {
-  composes: text from 'Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   font-family: $monoSpaceFontFamily;
 }
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css
index dc4d40e53..d0720cb6a 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.css
@@ -27,7 +27,7 @@
 }
 
 .nameInput {
-  composes: text from 'Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   margin-top: 4px;
   margin-right: 10px;
diff --git a/frontend/src/Settings/Quality/Definition/QualityDefinition.css b/frontend/src/Settings/Quality/Definition/QualityDefinition.css
index 089dd16b9..81fbc8577 100644
--- a/frontend/src/Settings/Quality/Definition/QualityDefinition.css
+++ b/frontend/src/Settings/Quality/Definition/QualityDefinition.css
@@ -60,7 +60,7 @@
 }
 
 .sizeInput {
-  composes: text from 'Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   display: inline-block;
   margin-left: 5px;
diff --git a/frontend/src/Styles/Variables/fonts.js b/frontend/src/Styles/Variables/fonts.js
index 6221ce5f1..b95c6f640 100644
--- a/frontend/src/Styles/Variables/fonts.js
+++ b/frontend/src/Styles/Variables/fonts.js
@@ -2,6 +2,7 @@ module.exports = {
   // Families
   defaultFontFamily: 'Roboto, "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif',
   monoSpaceFontFamily: '"Ubuntu Mono", Menlo, Monaco, Consolas, "Courier New", monospace;',
+  passwordFamily: 'text-security-disc',
 
   // Sizes
   extraSmallFontSize: '11px',