diff --git a/classes/dlg.php b/classes/dlg.php
index 55eb5e37e..cd098d396 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -284,12 +284,13 @@ class Dlg extends Protected_Handler {
 				" <input
 					placeHolder=\"".__("Password")."\"
 					dojoType=\"dijit.form.TextBox\" type='password'
-					style=\"width : 10em;\" name='pass'\">
+					style=\"width : 10em;\" name='pass'\">".
+				" <p class='insensitive'>".__("OAuth will be used automatically for Twitter feeds.")."</p>
 			</div></div>";
 
 
 		print "<div style=\"clear : both\">
-			<input type=\"checkbox\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\"
+			<input type=\"checkbox\" name=\"need_auth\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\"
 					onclick='checkboxToggleElement(this, \"feedDlg_loginContainer\")'>
 				<label for=\"feedDlg_loginCheck\">".
 				__('This feed requires authentication.')."</div>";
diff --git a/classes/rpc.php b/classes/rpc.php
index 1da3a14ec..58e25a456 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -188,8 +188,9 @@ class RPC extends Protected_Handler {
 		$cat = db_escape_string($_REQUEST['cat']);
 		$login = db_escape_string($_REQUEST['login']);
 		$pass = db_escape_string($_REQUEST['pass']);
+		$need_auth = db_escape_string($_REQUEST['need_auth']) != "";
 
-		$rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass);
+		$rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass, $need_auth);
 
 		print json_encode(array("result" => $rc));
 	}
diff --git a/include/functions.php b/include/functions.php
index 415047458..3ace20f86 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1843,14 +1843,6 @@
 	}
 
 	/**
-	 * Subscribes the user to the given feed
-	 *
-	 * @param resource $link       Database connection
-	 * @param string   $url        Feed URL to subscribe to
-	 * @param integer  $cat_id     Category ID the feed shall be added to
-	 * @param string   $auth_login (optional) Feed username
-	 * @param string   $auth_pass  (optional) Feed password
-	 *
 	 * @return integer Status code:
 	 *                 0 - OK, Feed already exists
 	 *                 1 - OK, Feed added
@@ -1862,7 +1854,7 @@
 	 *                 5 - Couldn't download the URL content.
 	 */
 	function subscribe_to_feed($link, $url, $cat_id = 0,
-			$auth_login = '', $auth_pass = '') {
+			$auth_login = '', $auth_pass = '', $need_auth = false) {
 
 		require_once "include/rssfuncs.php";
 
@@ -1877,7 +1869,7 @@
 
 		$has_oauth = db_fetch_result($result, 0, 'twitter_oauth');
 
-		if (!$has_oauth || strpos($url, '://api.twitter.com') === false) {
+		if (!$need_auth || !$has_oauth || strpos($url, '://api.twitter.com') === false) {
 			if (!fetch_file_contents($url, false, $auth_login, $auth_pass)) return 5;
 
 			if (url_is_html($url, $auth_login, $auth_pass)) {