diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/async/LoginAction.java b/app/src/main/java/org/nuclearfog/twidda/backend/async/LoginAction.java
index 0e1eb502..5e675cff 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/async/LoginAction.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/async/LoginAction.java
@@ -36,8 +36,8 @@ public class LoginAction extends AsyncTask<String, Void, String> {
 	private WeakReference<LoginActivity> weakRef;
 	private AccountDatabase accountDB;
 	private AppDatabase database;
+	@Nullable
 	private Connection connection;
-
 	@Nullable
 	private ConnectionException exception;
 	private int mode;
@@ -47,7 +47,7 @@ public class LoginAction extends AsyncTask<String, Void, String> {
 	 *
 	 * @param activity  Activity Context
 	 * @param mode      indicating login step
-	 * @param networkId ID of the selected network ID // todo add compile time check
+	 * @param networkId ID of the selected network ID
 	 */
 	public LoginAction(LoginActivity activity, int mode, int networkId) {
 		super();
@@ -57,8 +57,6 @@ public class LoginAction extends AsyncTask<String, Void, String> {
 
 		if (networkId == LoginActivity.SELECTOR_TWITTER)
 			connection = ConnectionManager.get(activity, ConnectionManager.SELECT_TWITTER);
-		else
-			connection = ConnectionManager.get(activity);
 		this.mode = mode;
 	}
 
diff --git a/app/src/main/res/layout/page_login.xml b/app/src/main/res/layout/page_login.xml
index ac8a5052..1ef46b12 100644
--- a/app/src/main/res/layout/page_login.xml
+++ b/app/src/main/res/layout/page_login.xml
@@ -78,7 +78,7 @@
 		android:autofillHints="pin"
 		android:background="@android:color/transparent"
 		android:drawablePadding="@dimen/loginpage_padding_drawable"
-		android:hint="@string/login_key1"
+		android:hint="@string/settings_key1_hint"
 		android:inputType="textPassword"
 		android:singleLine="true"
 		android:textSize="@dimen/loginpage_textsize_api_key"
@@ -97,7 +97,7 @@
 		android:autofillHints="pin"
 		android:background="@android:color/transparent"
 		android:drawablePadding="@dimen/loginpage_padding_drawable"
-		android:hint="@string/login_key2"
+		android:hint="@string/settings_key2_hint"
 		android:inputType="textPassword"
 		android:singleLine="true"
 		android:textSize="@dimen/loginpage_textsize_api_key"
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 7e61603d..97a5c03b 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -170,7 +170,6 @@
 	<string name="settings_icon_color">Symbolfarbe</string>
 	<string name="settings_key1_hint">Consumer Key</string>
 	<string name="settings_key2_hint">Consumer Secret</string>
-	<string name="settings_setup_custom_keys">Eigene API Schlüssel verwenden</string>
 	<string name="error_api_access_denied">Fehler, API Zugang wurde abgelehnt! Bitte API Schlüssel überprüfen!</string>
 	<string name="error_mention_exceed">Zu viele Nutzer Erwähnungen!</string>
 	<string name="error_api_key_expired">Fehler, API Schlüssel veraltet, bitte App aktualisieren!</string>
@@ -206,7 +205,6 @@
 	<string name="info_permission_read">Leserechte werden benötigt um Bilder und Videos einzufügen.</string>
 	<string name="info_permission_location">Standortinformationen werden ausschließlich für Tweets verwendet.</string>
 	<string name="error_result_cancelled">Fehler, Anfrage wurde abgebrochen!</string>
-	<string name="settings_api_info">• Eine Änderung der API Schlüssel erfordert erneutes einloggen</string>
 	<string name="settings_color_like">Like</string>
 	<string name="settings_color_fav">Favorit</string>
 	<string name="settings_enable_like">\"Like\" anstatt \"Favorit\" verwenden</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 72e48a78..c9ca1e1d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -72,7 +72,6 @@
 	<string name="item_image_save">保存图片</string>
 	<string name="settings_enable_proxy">启用代理</string>
 	<string name="settings_enable_proxy_auth">使用代理认证</string>
-	<string name="settings_setup_custom_keys">设置自定义API密钥</string>
 	<string name="tweet_sensitive_media">敏感内容</string>
 	<!--<string name="login_info">只需三步即可登录</string>-->
 	<string name="userlist_public_sel">公开</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 147a1286..524109ad 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -143,7 +143,6 @@
 	<dimen name="loginpage_toolbar_height">@dimen/toolbar_height</dimen>
 	<dimen name="loginpage_layout_margin">8dp</dimen>
 	<dimen name="loginpage_dropdown_margin">5dp</dimen>
-	<dimen name="loginpage_textview_margin">5dp</dimen>
 	<dimen name="loginpage_button_padding">24dp</dimen>
 	<dimen name="loginpage_textsize_button">14sp</dimen>
 	<dimen name="loginpage_padding_drawable">5dp</dimen>
@@ -151,7 +150,6 @@
 	<dimen name="loginpage_textsize_api_key">16sp</dimen>
 	<dimen name="loginpage_textsize_login_key">20sp</dimen>
 	<dimen name="loginpage_number_padding">10dp</dimen>
-	<integer name="loginpage_pin_max_chars">10</integer>
 
 	<!--dimens of page_metrics.xml-->
 	<dimen name="metrics_toolbar_height">@dimen/toolbar_height</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4a896bf..16a72f44 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -154,8 +154,6 @@
 	<string name="profile_image">Profile image</string>
 	<string name="login_pin">enter PIN</string>
 	<string name="login_key_enable">add api keys</string>
-	<string name="login_key1">consumer key</string>
-	<string name="login_key2">consumer secret</string>
 	<string name="login_verifier">login</string>
 	<string name="popup_tweet_hint" translatable="false">Tweet</string>
 	<string name="title_settings">Settings</string>
@@ -173,7 +171,6 @@
 	<string name="settings_color_fav">Favorite</string>
 	<string name="settings_enable_indicators">show additional Tweet information</string>
 	<string name="highlight">Highlight</string>
-	<string name="settings_api_info">• changing API Keys requires re-login</string>
 	<string name="settings_list_size">List size</string>
 	<string name="settings_enable_like">use \'Like\' instead of ’Favorite’</string>
 	<string name="confirm_retry_button">retry</string>
@@ -241,7 +238,6 @@
 	<string name="item_image_save">save image</string>
 	<string name="settings_enable_proxy">enable proxy</string>
 	<string name="settings_enable_proxy_auth">enable proxy authentication</string>
-	<string name="settings_setup_custom_keys">setup custom API keys</string>
 	<string name="tweet_sensitive_media">sensitive content</string>
 	<string name="login_info">4 steps to login</string>
 	<string name="login_first_opt" translatable="false">1.</string>