diff --git a/src/Jackett.Common/Definitions/52pt.yml b/src/Jackett.Common/Definitions/52pt.yml
index f8d143f81..d0d3400cf 100644
--- a/src/Jackett.Common/Definitions/52pt.yml
+++ b/src/Jackett.Common/Definitions/52pt.yml
@@ -62,9 +62,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("登录失败"))
   test:
     path: index.php
     selector: a[href*="logout.php"]
diff --git a/src/Jackett.Common/Definitions/beitai.yml b/src/Jackett.Common/Definitions/beitai.yml
index 790c47035..c31530181 100644
--- a/src/Jackett.Common/Definitions/beitai.yml
+++ b/src/Jackett.Common/Definitions/beitai.yml
@@ -56,8 +56,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
+    - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: index.php
     selector: a[href="logout.php"]
diff --git a/src/Jackett.Common/Definitions/hd4fans.yml b/src/Jackett.Common/Definitions/hd4fans.yml
index c6baeda63..3502442f4 100644
--- a/src/Jackett.Common/Definitions/hd4fans.yml
+++ b/src/Jackett.Common/Definitions/hd4fans.yml
@@ -32,8 +32,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
+    - selector: td.embedded:has(h2:contains("失败"))
       message:
         selector: td.text
   test:
diff --git a/src/Jackett.Common/Definitions/hdarea.yml b/src/Jackett.Common/Definitions/hdarea.yml
index f9c7b1b28..873d37bc5 100644
--- a/src/Jackett.Common/Definitions/hdarea.yml
+++ b/src/Jackett.Common/Definitions/hdarea.yml
@@ -65,8 +65,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
+    - selector: td.embedded:has(h2:contains("失败"))
     - selector: td.embedded:has(h2:contains("failed"))
   test:
     path: index.php
diff --git a/src/Jackett.Common/Definitions/hddolby.yml b/src/Jackett.Common/Definitions/hddolby.yml
index cfb3ab393..49deec9c9 100644
--- a/src/Jackett.Common/Definitions/hddolby.yml
+++ b/src/Jackett.Common/Definitions/hddolby.yml
@@ -34,8 +34,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: ""
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
+    - selector: td.embedded:has(h2:contains("失败"))
       message:
         selector: td.text
   test:
diff --git a/src/Jackett.Common/Definitions/hdu.yml b/src/Jackett.Common/Definitions/hdu.yml
index f0a52382b..db5f6ea13 100644
--- a/src/Jackett.Common/Definitions/hdu.yml
+++ b/src/Jackett.Common/Definitions/hdu.yml
@@ -40,8 +40,9 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    ssl: yes
+    trackerssl: ""
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
     - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: index.php
diff --git a/src/Jackett.Common/Definitions/keepfriends.yml b/src/Jackett.Common/Definitions/keepfriends.yml
index 2aa381db4..0d5cab20d 100644
--- a/src/Jackett.Common/Definitions/keepfriends.yml
+++ b/src/Jackett.Common/Definitions/keepfriends.yml
@@ -77,7 +77,7 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    g2fa_code: "{{ .Config.2facode }}"
+    token: "{{ .Config.2facode }}"
     logout: ""
   error:
     - selector: td.embedded:has(h2:contains("失败"))
diff --git a/src/Jackett.Common/Definitions/nethd.yml b/src/Jackett.Common/Definitions/nethd.yml
index 7a4e5dde5..819f728f1 100644
--- a/src/Jackett.Common/Definitions/nethd.yml
+++ b/src/Jackett.Common/Definitions/nethd.yml
@@ -53,6 +53,10 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: ""
+    trackerssl: ""
   error:
     - selector: form#loginform > span.warning
   test:
diff --git a/src/Jackett.Common/Definitions/oshenpt.yml b/src/Jackett.Common/Definitions/oshenpt.yml
index 403ca4ebb..b2af0252e 100644
--- a/src/Jackett.Common/Definitions/oshenpt.yml
+++ b/src/Jackett.Common/Definitions/oshenpt.yml
@@ -6,7 +6,9 @@ language: zh-cn
 type: private
 encoding: UTF-8
 links:
-  - https://www.oshen.win/
+  - http://www.oshen.win/
+links:
+  - https://www.oshen.win/ # forces http
 
 caps:
   categorymappings:
@@ -57,8 +59,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: ""
+    trackerssl: ""
   error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
+    - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: index.php
     selector: a[href="logout.php"]
diff --git a/src/Jackett.Common/Definitions/pterclub.yml b/src/Jackett.Common/Definitions/pterclub.yml
index f6963d556..c29ae6e0e 100644
--- a/src/Jackett.Common/Definitions/pterclub.yml
+++ b/src/Jackett.Common/Definitions/pterclub.yml
@@ -79,7 +79,6 @@ login:
     trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("登录失败"))
   test:
     path: index.php
     selector: a[data-url="logout.php"]
diff --git a/src/Jackett.Common/Definitions/soulvoice.yml b/src/Jackett.Common/Definitions/soulvoice.yml
index a445aef88..6aac1a8fd 100644
--- a/src/Jackett.Common/Definitions/soulvoice.yml
+++ b/src/Jackett.Common/Definitions/soulvoice.yml
@@ -61,13 +61,12 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    ssl: yes
-    tracker: yes
     logout: ""
     securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("登录失败"))
   test:
     path: index.php
     selector: a[href="logout.php"]
diff --git a/src/Jackett.Common/Definitions/tlfbits.yml b/src/Jackett.Common/Definitions/tlfbits.yml
index 3bb06571b..afcf9f639 100644
--- a/src/Jackett.Common/Definitions/tlfbits.yml
+++ b/src/Jackett.Common/Definitions/tlfbits.yml
@@ -76,9 +76,11 @@ login:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
     logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("登录失败"))
   test:
     path: index.php
     selector: a[href="logout.php"]