diff --git a/template/html/add_subscription.html b/template/html/add_subscription.html
index bff7975f..6c6ef4d2 100644
--- a/template/html/add_subscription.html
+++ b/template/html/add_subscription.html
@@ -42,10 +42,10 @@
             <label><input type="checkbox" name="crawler" value="1" {{ if .form.Crawler }}checked{{ end }}> {{ t "Fetch original content" }}</label>
 
             <label for="form-username">{{ t "Feed Username" }}</label>
-            <input type="text" name="username" id="form-username" value="{{ .form.Username }}">
+            <input type="text" name="feed_username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password">
 
             <label for="form-password">{{ t "Feed Password" }}</label>
-            <input type="password" name="password" id="form-password" value="{{ .form.Password }}">
+            <input type="password" name="feed_password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
         </fieldset>
 
         <div class="buttons">
diff --git a/template/html/choose_subscription.html b/template/html/choose_subscription.html
index 7668605b..ad1c38ad 100644
--- a/template/html/choose_subscription.html
+++ b/template/html/choose_subscription.html
@@ -19,8 +19,8 @@
 <form action="{{ route "chooseSubscription" }}" method="POST">
     <input type="hidden" name="csrf" value="{{ .csrf }}">
     <input type="hidden" name="category_id" value="{{ .form.CategoryID }}">
-    <input type="hidden" name="username" value="{{ .form.Username }}">
-    <input type="hidden" name="password" value="{{ .form.Password }}">
+    <input type="hidden" name="feed_username" value="{{ .form.Username }}">
+    <input type="hidden" name="feed_password" value="{{ .form.Password }}">
     {{ if .form.Crawler }}
         <input type="hidden" name="crawler" value="1">
     {{ end }}
diff --git a/template/html/create_user.html b/template/html/create_user.html
index ada1c13d..f46defe1 100644
--- a/template/html/create_user.html
+++ b/template/html/create_user.html
@@ -30,10 +30,10 @@
     {{ end }}
 
     <label for="form-username">{{ t "Username" }}</label>
-    <input type="text" name="username" id="form-username" value="{{ .form.Username }}" required autofocus>
+    <input type="text" name="username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password" required autofocus>
 
     <label for="form-password">{{ t "Password" }}</label>
-    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" required>
+    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password" required>
 
     <label for="form-confirmation">{{ t "Confirmation" }}</label>
     <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" required>
diff --git a/template/html/edit_feed.html b/template/html/edit_feed.html
index 704472bb..8b7c560a 100644
--- a/template/html/edit_feed.html
+++ b/template/html/edit_feed.html
@@ -46,10 +46,10 @@
         <input type="url" name="feed_url" id="form-feed-url" placeholder="https://domain.tld/" value="{{ .form.FeedURL }}" required>
 
         <label for="form-username">{{ t "Feed Username" }}</label>
-        <input type="text" name="username" id="form-username" value="{{ .form.Username }}">
+        <input type="text" name="feed_username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password">
 
         <label for="form-password">{{ t "Feed Password" }}</label>
-        <input type="password" name="password" id="form-password" value="{{ .form.Password }}">
+        <input type="password" name="feed_password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
 
         <label for="form-scraper-rules">{{ t "Scraper Rules" }}</label>
         <input type="text" name="scraper_rules" id="form-scraper-rules" value="{{ .form.ScraperRules }}">
diff --git a/template/html/edit_user.html b/template/html/edit_user.html
index 06539d9b..7825021f 100644
--- a/template/html/edit_user.html
+++ b/template/html/edit_user.html
@@ -33,13 +33,13 @@
     {{ end }}
 
     <label for="form-username">{{ t "Username" }}</label>
-    <input type="text" name="username" id="form-username" value="{{ .form.Username }}" required autofocus>
+    <input type="text" name="username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password" required autofocus>
 
     <label for="form-password">{{ t "Password" }}</label>
-    <input type="password" name="password" id="form-password" value="{{ .form.Password }}">
+    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
 
     <label for="form-confirmation">{{ t "Confirmation" }}</label>
-    <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}">
+    <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" autocomplete="new-password">
 
     <label><input type="checkbox" name="is_admin" value="1" {{ if .form.IsAdmin }}checked{{ end }}> {{ t "Administrator" }}</label>
 
diff --git a/template/html/integrations.html b/template/html/integrations.html
index 5eef264f..593db810 100644
--- a/template/html/integrations.html
+++ b/template/html/integrations.html
@@ -38,7 +38,7 @@
         <input type="text" name="fever_username" id="form-fever-username" value="{{ .form.FeverUsername }}">
 
         <label for="form-fever-password">{{ t "Fever Password" }}</label>
-        <input type="password" name="fever_password" id="form-fever-password" value="{{ .form.FeverPassword }}">
+        <input type="password" name="fever_password" id="form-fever-password" value="{{ .form.FeverPassword }}" autocomplete="new-password">
 
         <p>{{ t "Fever API endpoint:" }} <strong>{{ rootURL }}{{ route "feverEndpoint" }}</strong></p>
     </div>
@@ -50,7 +50,7 @@
         </label>
 
         <label for="form-pinboard-token">{{ t "Pinboard API Token" }}</label>
-        <input type="password" name="pinboard_token" id="form-pinboard-token" value="{{ .form.PinboardToken }}">
+        <input type="password" name="pinboard_token" id="form-pinboard-token" value="{{ .form.PinboardToken }}" autocomplete="new-password">
 
         <label for="form-pinboard-tags">{{ t "Pinboard Tags" }}</label>
         <input type="text" name="pinboard_tags" id="form-pinboard-tags" value="{{ .form.PinboardTags }}">
@@ -70,7 +70,7 @@
         <input type="text" name="instapaper_username" id="form-instapaper-username" value="{{ .form.InstapaperUsername }}">
 
         <label for="form-instapaper-password">{{ t "Instapaper Password" }}</label>
-        <input type="password" name="instapaper_password" id="form-instapaper-password" value="{{ .form.InstapaperPassword }}">
+        <input type="password" name="instapaper_password" id="form-instapaper-password" value="{{ .form.InstapaperPassword }}" autocomplete="new-password">
     </div>
 
     <h3>Pocket</h3>
@@ -85,7 +85,7 @@
         {{ end }}
 
         <label for="form-pocket-access-token">{{ t "Pocket Access Token" }}</label>
-        <input type="password" name="pocket_access_token" id="form-pocket-access-token" value="{{ .form.PocketAccessToken }}">
+        <input type="password" name="pocket_access_token" id="form-pocket-access-token" value="{{ .form.PocketAccessToken }}" autocomplete="new-password">
 
         {{ if not .form.PocketAccessToken }}
             <p><a href="{{ route "pocketAuthorize" }}">{{ t "Connect your Pocket account" }}</a></p>
@@ -105,13 +105,13 @@
         <input type="text" name="wallabag_client_id" id="form-wallabag-client-id" value="{{ .form.WallabagClientID }}">
 
         <label for="form-wallabag-client-secret">{{ t "Wallabag Client Secret" }}</label>
-        <input type="password" name="wallabag_client_secret" id="form-wallabag-client-secret" value="{{ .form.WallabagClientSecret }}">
+        <input type="password" name="wallabag_client_secret" id="form-wallabag-client-secret" value="{{ .form.WallabagClientSecret }}" autocomplete="new-password">
 
         <label for="form-wallabag-username">{{ t "Wallabag Username" }}</label>
         <input type="text" name="wallabag_username" id="form-wallabag-username" value="{{ .form.WallabagUsername }}">
 
         <label for="form-wallabag-password">{{ t "Wallabag Password" }}</label>
-        <input type="password" name="wallabag_password" id="form-wallabag-password" value="{{ .form.WallabagPassword }}">
+        <input type="password" name="wallabag_password" id="form-wallabag-password" value="{{ .form.WallabagPassword }}" autocomplete="new-password">
     </div>
 
     <h3>Nunux Keeper</h3>
diff --git a/template/html/settings.html b/template/html/settings.html
index 8e66a104..7e765693 100644
--- a/template/html/settings.html
+++ b/template/html/settings.html
@@ -32,10 +32,10 @@
     <input type="text" name="username" id="form-username" value="{{ .form.Username }}" required>
 
     <label for="form-password">{{ t "Password" }}</label>
-    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="off">
+    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
 
     <label for="form-confirmation">{{ t "Confirmation" }}</label>
-    <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" autocomplete="off">
+    <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" autocomplete="new-password">
 
     <label for="form-language">{{ t "Language" }}</label>
     <select id="form-language" name="language">
diff --git a/template/views.go b/template/views.go
index 03a26362..a875ef2e 100644
--- a/template/views.go
+++ b/template/views.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2018-06-29 20:26:34.578915833 -0700 PDT m=+0.035901799
+// 2018-06-30 18:00:36.547092772 -0700 PDT m=+0.023261871
 
 package template
 
@@ -89,10 +89,10 @@ var templateViewsMap = map[string]string{
             <label><input type="checkbox" name="crawler" value="1" {{ if .form.Crawler }}checked{{ end }}> {{ t "Fetch original content" }}</label>
 
             <label for="form-username">{{ t "Feed Username" }}</label>
-            <input type="text" name="username" id="form-username" value="{{ .form.Username }}">
+            <input type="text" name="feed_username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password">
 
             <label for="form-password">{{ t "Feed Password" }}</label>
-            <input type="password" name="password" id="form-password" value="{{ .form.Password }}">
+            <input type="password" name="feed_password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
         </fieldset>
 
         <div class="buttons">
@@ -250,8 +250,8 @@ var templateViewsMap = map[string]string{
 <form action="{{ route "chooseSubscription" }}" method="POST">
     <input type="hidden" name="csrf" value="{{ .csrf }}">
     <input type="hidden" name="category_id" value="{{ .form.CategoryID }}">
-    <input type="hidden" name="username" value="{{ .form.Username }}">
-    <input type="hidden" name="password" value="{{ .form.Password }}">
+    <input type="hidden" name="feed_username" value="{{ .form.Username }}">
+    <input type="hidden" name="feed_password" value="{{ .form.Password }}">
     {{ if .form.Crawler }}
         <input type="hidden" name="crawler" value="1">
     {{ end }}
@@ -331,10 +331,10 @@ var templateViewsMap = map[string]string{
     {{ end }}
 
     <label for="form-username">{{ t "Username" }}</label>
-    <input type="text" name="username" id="form-username" value="{{ .form.Username }}" required autofocus>
+    <input type="text" name="username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password" required autofocus>
 
     <label for="form-password">{{ t "Password" }}</label>
-    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" required>
+    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password" required>
 
     <label for="form-confirmation">{{ t "Confirmation" }}</label>
     <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" required>
@@ -426,10 +426,10 @@ var templateViewsMap = map[string]string{
         <input type="url" name="feed_url" id="form-feed-url" placeholder="https://domain.tld/" value="{{ .form.FeedURL }}" required>
 
         <label for="form-username">{{ t "Feed Username" }}</label>
-        <input type="text" name="username" id="form-username" value="{{ .form.Username }}">
+        <input type="text" name="feed_username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password">
 
         <label for="form-password">{{ t "Feed Password" }}</label>
-        <input type="password" name="password" id="form-password" value="{{ .form.Password }}">
+        <input type="password" name="feed_password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
 
         <label for="form-scraper-rules">{{ t "Scraper Rules" }}</label>
         <input type="text" name="scraper_rules" id="form-scraper-rules" value="{{ .form.ScraperRules }}">
@@ -496,13 +496,13 @@ var templateViewsMap = map[string]string{
     {{ end }}
 
     <label for="form-username">{{ t "Username" }}</label>
-    <input type="text" name="username" id="form-username" value="{{ .form.Username }}" required autofocus>
+    <input type="text" name="username" id="form-username" value="{{ .form.Username }}" autocomplete="new-password" required autofocus>
 
     <label for="form-password">{{ t "Password" }}</label>
-    <input type="password" name="password" id="form-password" value="{{ .form.Password }}">
+    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
 
     <label for="form-confirmation">{{ t "Confirmation" }}</label>
-    <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}">
+    <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" autocomplete="new-password">
 
     <label><input type="checkbox" name="is_admin" value="1" {{ if .form.IsAdmin }}checked{{ end }}> {{ t "Administrator" }}</label>
 
@@ -869,7 +869,7 @@ var templateViewsMap = map[string]string{
         <input type="text" name="fever_username" id="form-fever-username" value="{{ .form.FeverUsername }}">
 
         <label for="form-fever-password">{{ t "Fever Password" }}</label>
-        <input type="password" name="fever_password" id="form-fever-password" value="{{ .form.FeverPassword }}">
+        <input type="password" name="fever_password" id="form-fever-password" value="{{ .form.FeverPassword }}" autocomplete="new-password">
 
         <p>{{ t "Fever API endpoint:" }} <strong>{{ rootURL }}{{ route "feverEndpoint" }}</strong></p>
     </div>
@@ -881,7 +881,7 @@ var templateViewsMap = map[string]string{
         </label>
 
         <label for="form-pinboard-token">{{ t "Pinboard API Token" }}</label>
-        <input type="password" name="pinboard_token" id="form-pinboard-token" value="{{ .form.PinboardToken }}">
+        <input type="password" name="pinboard_token" id="form-pinboard-token" value="{{ .form.PinboardToken }}" autocomplete="new-password">
 
         <label for="form-pinboard-tags">{{ t "Pinboard Tags" }}</label>
         <input type="text" name="pinboard_tags" id="form-pinboard-tags" value="{{ .form.PinboardTags }}">
@@ -901,7 +901,7 @@ var templateViewsMap = map[string]string{
         <input type="text" name="instapaper_username" id="form-instapaper-username" value="{{ .form.InstapaperUsername }}">
 
         <label for="form-instapaper-password">{{ t "Instapaper Password" }}</label>
-        <input type="password" name="instapaper_password" id="form-instapaper-password" value="{{ .form.InstapaperPassword }}">
+        <input type="password" name="instapaper_password" id="form-instapaper-password" value="{{ .form.InstapaperPassword }}" autocomplete="new-password">
     </div>
 
     <h3>Pocket</h3>
@@ -916,7 +916,7 @@ var templateViewsMap = map[string]string{
         {{ end }}
 
         <label for="form-pocket-access-token">{{ t "Pocket Access Token" }}</label>
-        <input type="password" name="pocket_access_token" id="form-pocket-access-token" value="{{ .form.PocketAccessToken }}">
+        <input type="password" name="pocket_access_token" id="form-pocket-access-token" value="{{ .form.PocketAccessToken }}" autocomplete="new-password">
 
         {{ if not .form.PocketAccessToken }}
             <p><a href="{{ route "pocketAuthorize" }}">{{ t "Connect your Pocket account" }}</a></p>
@@ -936,13 +936,13 @@ var templateViewsMap = map[string]string{
         <input type="text" name="wallabag_client_id" id="form-wallabag-client-id" value="{{ .form.WallabagClientID }}">
 
         <label for="form-wallabag-client-secret">{{ t "Wallabag Client Secret" }}</label>
-        <input type="password" name="wallabag_client_secret" id="form-wallabag-client-secret" value="{{ .form.WallabagClientSecret }}">
+        <input type="password" name="wallabag_client_secret" id="form-wallabag-client-secret" value="{{ .form.WallabagClientSecret }}" autocomplete="new-password">
 
         <label for="form-wallabag-username">{{ t "Wallabag Username" }}</label>
         <input type="text" name="wallabag_username" id="form-wallabag-username" value="{{ .form.WallabagUsername }}">
 
         <label for="form-wallabag-password">{{ t "Wallabag Password" }}</label>
-        <input type="password" name="wallabag_password" id="form-wallabag-password" value="{{ .form.WallabagPassword }}">
+        <input type="password" name="wallabag_password" id="form-wallabag-password" value="{{ .form.WallabagPassword }}" autocomplete="new-password">
     </div>
 
     <h3>Nunux Keeper</h3>
@@ -1111,10 +1111,10 @@ var templateViewsMap = map[string]string{
     <input type="text" name="username" id="form-username" value="{{ .form.Username }}" required>
 
     <label for="form-password">{{ t "Password" }}</label>
-    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="off">
+    <input type="password" name="password" id="form-password" value="{{ .form.Password }}" autocomplete="new-password">
 
     <label for="form-confirmation">{{ t "Confirmation" }}</label>
-    <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" autocomplete="off">
+    <input type="password" name="confirmation" id="form-confirmation" value="{{ .form.Confirmation }}" autocomplete="new-password">
 
     <label for="form-language">{{ t "Language" }}</label>
     <select id="form-language" name="language">
@@ -1268,25 +1268,25 @@ var templateViewsMap = map[string]string{
 
 var templateViewsMapChecksums = map[string]string{
 	"about":               "ad2fb778fc73c39b733b3f81b13e5c7d689b041fadd24ee2d4577f545aa788ad",
-	"add_subscription":    "5067776ce452543fceed8b62defe5fbfed41e3d5bd79b5f2acf8c45ef4faac6d",
+	"add_subscription":    "39e5efb11cd7e85092e2c9637931ca43130beaf7cc09b1f8cc25908e45553fd5",
 	"bookmark_entries":    "8e5fea7559218a34289c2f0e54955fc0ef3b9e629205927841cbcc2276aefb2a",
 	"categories":          "ca1280cd157bb527d4fc907da67b05a8347378f6dce965b9389d4bcdf3600a11",
 	"category_entries":    "6ad52c8d0c28e21ea48be76228ea8432adde1dc190010753a48928477d52e065",
-	"choose_subscription": "c680e690255d53da1f4f11e9b997bc2a32ca659f1245076e5738243859e17876",
+	"choose_subscription": "7266b269ddbe145e757a24a57f3fbc7611e34a20383fbd887988204cebce2681",
 	"create_category":     "2b82af5d2dcd67898dc5daa57a6461e6ff8121a6089b2a2a1be909f35e4a2275",
-	"create_user":         "233764778c915754141a20429ec8db9bf80ef2d7704867a2d7232c1e9df233ae",
+	"create_user":         "1ef0a1f9bf119d44929c81f13073a257d69650cf5064960cf06a63fe51923e86",
 	"edit_category":       "cee720faadcec58289b707ad30af623d2ee66c1ce23a732965463250d7ff41c5",
-	"edit_feed":           "66dd3ca6357645944a99f8b9c0455253e6d2bf5f36faf9aa322689b6299b0104",
-	"edit_user":           "321e0a60cf3bf7441bff970f4920e4c5b7c1883f80ab1d1674f8137954b25033",
+	"edit_feed":           "785784bc0ed903eb7f6f476562507ddf454874f854482caaa950cc38f5e652cc",
+	"edit_user":           "7373e09f805e6c017167001519b9feb04226be6c81c2875cbacd5ce94f2c24bf",
 	"entry":               "aa7a7e6349a0243bee8629dbcfdd94e21da193df7ef5af0b5aab39ab8c793279",
 	"feed_entries":        "4dffdb55cfad29df20612efe7ed2dbed03d919c4556898543ab6450f610d3c99",
 	"feeds":               "2a5abe37968ea34a0576dbef52341645cb1fc9562e351382fbf721491da6f4fa",
 	"history_entries":     "451f0b202f47c9db5344d3e73862f5b7afbd4323fbdba21b6087866c40f045d3",
 	"import":              "73b5112e20bfd232bf73334544186ea419505936bc237d481517a8622901878f",
-	"integrations":        "4f93dab2630e6b3bf8bf51fc844e48fc763b8e7d6bb98c3c1692ea43f0e93930",
+	"integrations":        "20c1c82070b93235d189b10acccd0cda5694cc5684d0b3be23de2ba5ae83e73f",
 	"login":               "7d83c3067c02f1f6aafdd8816c7f97a4eb5a5a4bdaaaa4cc1e2fbb9c17ea65e8",
 	"sessions":            "3fa79031dd883847eba92fbafe5f535fa3a4e1614bb610f20588b6f8fc8b3624",
-	"settings":            "ea2505b9d0a6d6bb594dba87a92079de19baa6d494f0651693a7685489fb7de9",
+	"settings":            "d435dc37e82896ce9a7a573b3c2aeda1db71eec62349e2472ebbf1d5c3e0bc21",
 	"unread_entries":      "ca3ef1547d7d170b005a2f48fabd4c0a15550884db5e481659c13ffe6a47d19d",
 	"users":               "c6d91b0b29984b4cb3073bec6a2933cfb72981ec60f54b6c7aa05194f0e860bd",
 }
diff --git a/ui/form/feed.go b/ui/form/feed.go
index 1a3766b8..853287a3 100644
--- a/ui/form/feed.go
+++ b/ui/form/feed.go
@@ -64,7 +64,7 @@ func NewFeedForm(r *http.Request) *FeedForm {
 		RewriteRules: r.FormValue("rewrite_rules"),
 		Crawler:      r.FormValue("crawler") == "1",
 		CategoryID:   int64(categoryID),
-		Username:     r.FormValue("username"),
-		Password:     r.FormValue("password"),
+		Username:     r.FormValue("feed_username"),
+		Password:     r.FormValue("feed_password"),
 	}
 }
diff --git a/ui/form/subscription.go b/ui/form/subscription.go
index 015f60fd..122d25ab 100644
--- a/ui/form/subscription.go
+++ b/ui/form/subscription.go
@@ -40,7 +40,7 @@ func NewSubscriptionForm(r *http.Request) *SubscriptionForm {
 		URL:        r.FormValue("url"),
 		Crawler:    r.FormValue("crawler") == "1",
 		CategoryID: int64(categoryID),
-		Username:   r.FormValue("username"),
-		Password:   r.FormValue("password"),
+		Username:   r.FormValue("feed_username"),
+		Password:   r.FormValue("feed_password"),
 	}
 }