diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 516ec9a8b..a585fcedc 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -68,13 +68,16 @@
 		<div class="form-group">
 			<label class="group-name" for="http_user"><?= _t('sub.feed.auth.username') ?></label>
 			<div class="group-controls">
-				<input type="text" name="http_user" id="http_user" class="extend" value="<?= empty($auth['username']) ? ' ' : $auth['username'] ?>" autocomplete="off" />
+				<input type="text" name="http_user" id="http_user" class="extend" value="<?= $auth['username'] ?>" autocomplete="off" />
 				<p class="help"><?= _i('help') ?> <?= _t('sub.feed.auth.help') ?></p>
 			</div>
 
 			<label class="group-name" for="http_pass"><?= _t('sub.feed.auth.password') ?></label>
 			<div class="group-controls">
-				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?= $auth['password'] ?>" autocomplete="new-password" />
+				<div class="stick">
+					<input type="password" name="http_pass" id="http_pass" class="extend" value="<?= $auth['password'] ?>" autocomplete="new-password" />
+					<a class="btn toggle-password" data-toggle="http_user"><?= _i('key') ?></a>
+				</div>
 			</div>
 		</div>
 
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 44e3c6c92..32ad8fd17 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -139,8 +139,11 @@
 
 			<label class="group-name" for="http_pass_feed<?= $this->feed->id() ?>"><?= _t('sub.feed.auth.password') ?></label>
 			<div class="group-controls">
-				<input type="password" name="http_pass_feed<?= $this->feed->id() ?>" id="http_pass_feed<?= $this->feed->id() ?>" class="extend" value="<?=
-					$auth['password'] ?>" autocomplete="new-password" />
+				<div class="stick">
+					<input type="password" name="http_pass_feed<?= $this->feed->id() ?>" id="http_pass_feed<?= $this->feed->id() ?>" value="<?=
+						$auth['password'] ?>" autocomplete="new-password" />
+					<a class="btn toggle-password" data-toggle="http_pass_feed<?= $this->feed->id() ?>"><?= _i('key') ?></a>
+				</div>
 			</div>
 		</div>
 
diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml
index 65279bfc5..72abbeb30 100644
--- a/app/views/subscription/add.phtml
+++ b/app/views/subscription/add.phtml
@@ -63,7 +63,10 @@
 			<div class="form-group">
 				<label class="group-name" for="http_pass"><?= _t('sub.feed.auth.password') ?></label>
 				<div class="group-controls">
-					<input id="http_pass" name="http_pass" type="text" value=" " autocomplete="new-password"/>
+					<div class="stick">
+						<input id="http_pass" name="http_pass" type="password" value="" autocomplete="new-password" />
+						<a class="btn toggle-password" data-toggle="http_pass"><?= _i('key') ?></a>
+					</div>
 				</div>
 			</div>
 
diff --git a/p/scripts/extra.js b/p/scripts/extra.js
index 3aa1b6d46..e487ab8c9 100644
--- a/p/scripts/extra.js
+++ b/p/scripts/extra.js
@@ -150,6 +150,7 @@ function init_slider_observers() {
 					closer.classList.add('active');
 					context.ajax_loading = false;
 					fix_popup_preview_selector();
+					init_extra();
 				};
 				req.send();
 				return false;