diff --git a/boot.php b/boot.php
index 2ac6ee7914..948cca46dc 100644
--- a/boot.php
+++ b/boot.php
@@ -163,6 +163,7 @@ class App {
 		if($this->cmd === '.well-known/host-meta')
 			require_once('include/hostxrd.php');
 
+
 		$this->pager['page'] = ((x($_GET,'page')) ? $_GET['page'] : 1);
 		$this->pager['itemspage'] = 50;
 		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
diff --git a/include/auth.php b/include/auth.php
index c0a747def8..ccaa970de1 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -49,6 +49,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 			$_SESSION['cid'] = $a->cid;
 
 		}
+		header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 	}
 }
 else {
@@ -98,6 +99,8 @@ else {
 			$a->cid = $r[0]['id'];
 			$_SESSION['cid'] = $a->cid;
 		}
+
+		header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 		if(($a->module !== 'home') && isset($_SESSION['return_url']))
 			goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
 	}
diff --git a/index.php b/index.php
index 46f001738f..abb528f951 100644
--- a/index.php
+++ b/index.php
@@ -31,9 +31,12 @@ $a->init_pagehead();
 session_start();
 
 
-if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')))
+if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
 	require("auth.php");
 
+if(! x($_SESSION,'authenticated'))
+	header('X-Account-Management-Status: none');
+
 if(! x($_SESSION,'sysmsg'))
 	$_SESSION['sysmsg'] = '';
 
diff --git a/mod/amcd.php b/mod/amcd.php
new file mode 100644
index 0000000000..01c6b92da5
--- /dev/null
+++ b/mod/amcd.php
@@ -0,0 +1,26 @@
+<?php
+
+function amcd_content(&$a) {
+header("Content-type: text/json");
+echo <<< EOT
+{
+  "methods": {
+    "username-password-form": {
+      "connect": {
+        "method":"POST",
+        "path":"/login",
+        "params": {
+          "username":"login-name",
+          "password":"password"
+        }
+      },
+      "disconnect": {
+        "method":"GET",
+        "path":"/logout"
+      }
+    }
+  }
+}
+EOT;
+killme();
+}
\ No newline at end of file
diff --git a/mod/profile.php b/mod/profile.php
index 99c775c4ee..8dd7b8ebf1 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -70,7 +70,7 @@ function profile_init(&$a) {
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
 	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
 	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
-	header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"');
+	header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
   
 	
 	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
diff --git a/mod/session.php b/mod/session.php
new file mode 100644
index 0000000000..22c855edba
--- /dev/null
+++ b/mod/session.php
@@ -0,0 +1,5 @@
+<?php
+
+function session_content(&$a) {
+
+}
diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl
index 091c1541ba..fae70dec9e 100644
--- a/view/xrd_host.tpl
+++ b/view/xrd_host.tpl
@@ -4,8 +4,8 @@
  
     <hm:Host>$domain</hm:Host>
  
-    <Link rel='lrdd'
-          template='http://$domain/xrd/?uri={uri}'>
-        <Title>Resource Descriptor</Title>
-    </Link>
+    <Link rel='lrdd' template='http://$domain/xrd/?uri={uri}' />
+    <Link rel='acct-mgmt' href='http://$domain/amcd' />
+    <Link rel='http://services.mozilla.com/amcd/0.1' href='http://$domain/amcd' />
+
 </XRD>