diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index 93e0844c1f..0198671e77 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -24,8 +24,17 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 class TwitapiaccountAction extends TwitterapiAction {
 
 	function verify_credentials($args, $apidata) {
-		parent::handle($args);
-		common_server_error("API method under construction.", $code=501);
+
+		if ($apidata['content-type'] == 'xml') {
+			header('Content-Type: application/xml; charset=utf-8');		
+			print '<authorized>true</authorized>';
+		} elseif ($apidata['content-type'] == 'json') {
+			header('Content-Type: application/json; charset=utf-8');		
+			print '{"authorized":true}';
+		} else {
+			common_user_error("API method not found!", $code=404);
+		}
+			
 		exit();
 	}
 	
diff --git a/lib/util.php b/lib/util.php
index 9f235494bc..5e3e8c98d0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -227,7 +227,7 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 function common_show_basic_auth_error() {
   	header('HTTP/1.1 401 Unauthorized');
 	header('Content-type: text/plain');
-   	print("Could not authenticate you.\n"); # exactly what Twitter says
+   	print("Could not authenticate you."); # exactly what Twitter says - no \n
 	exit();
 }