diff --git a/Changelog b/Changelog
index d0a06929a..fce2a5941 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2019-08-20 DariusIII
+	* Chg: Adjust site settings for passwordstatus changes
 	* Chg: Change used passwordstatus for releases
 	* Chg: Update tinyMCE to latest version
 2019-08-19 DariusIII
diff --git a/app/Http/Controllers/Admin/SiteController.php b/app/Http/Controllers/Admin/SiteController.php
index 2c4b4be34..fb9c6f7a1 100644
--- a/app/Http/Controllers/Admin/SiteController.php
+++ b/app/Http/Controllers/Admin/SiteController.php
@@ -107,12 +107,10 @@ class SiteController extends BasePageController
         $this->smarty->assign('registerstatus_ids', [Settings::REGISTER_STATUS_OPEN, Settings::REGISTER_STATUS_INVITE, Settings::REGISTER_STATUS_CLOSED]);
         $this->smarty->assign('registerstatus_names', ['Open', 'Invite', 'Closed']);
 
-        $this->smarty->assign('passworded_ids', [0, 1, 2]);
+        $this->smarty->assign('passworded_ids', [0, 1]);
         $this->smarty->assign('passworded_names', [
-            'Hide passworded or potentially passworded (*yes)',
-            'Hide passworded or potentially passworded (*no)',
-            'Show non-passworded and potentially passworded (*no)',
-            'Show everything (*no)',
+            'Hide passworded',
+            'Show everything',
         ]);
 
         $this->smarty->assign('lookuplanguage_iso', ['en', 'de', 'es', 'fr', 'it', 'nl', 'pt', 'sv']);
diff --git a/resources/views/themes/admin/site-edit.tpl b/resources/views/themes/admin/site-edit.tpl
index cec3734e0..168e93236 100644
--- a/resources/views/themes/admin/site-edit.tpl
+++ b/resources/views/themes/admin/site-edit.tpl
@@ -724,25 +724,14 @@
 							passworded.<br/></div>
 					</td>
 				</tr>
-				<tr>
-					<td style="width:180px;"><label for="deletepossiblerelease">Delete Possibly Passworded
-							Releases:</label></td>
-					<td>
-						{html_radios id="deletepossiblerelease" name='deletepossiblerelease' values=$yesno_ids output=$yesno_names selected=$site->deletepossiblerelease separator='<br />'}
-						<div class="hint">Whether to delete releases which are potentially passworded. This applies to
-							your post process additional inner file blacklist.<br/></div>
-					</td>
-				</tr>
 
 				<tr>
 					<td><label for="showpasswordedrelease">Show Passworded Releases</label>:</td>
 					<td>
 						{html_options id="showpasswordedrelease" name='showpasswordedrelease' values=$passworded_ids output=$passworded_names selected=$site->showpasswordedrelease}
-						<div class="hint">Whether to show passworded or potentially passworded releases in browse,
+						<div class="hint">Whether to show passworded releases in browse,
 							search, api and rss
-							feeds. Potentially passworded means releases which contain .cab or .ace files which are
-							typically password protected. (*yes): Unprocessed releases are hidden. (*no): Unprocessed
-							releases are displayed.
+							feeds.
 						</div>
 					</td>
 				</tr>