Index: standard/src/main/webapp/templates/login.vm
===================================================================
--- standard/src/main/webapp/templates/login.vm	(revision 11817)
+++ standard/src/main/webapp/templates/login.vm	(working copy)
@@ -18,34 +18,71 @@
 ###
 #template("startpage.vm")
 <div class="main layoutsubsection">
-<form id="loginForm" action="$doc.getURL("loginsubmit")" method="post">
-<div class="hidden"><input type="hidden" name="xredirect" value="$!request.xredirect"/>
-#if("$!request.srid" != "")
-<input type="hidden" name="srid" value="$!request.srid"/>
-#end
-</div>
-#xwikimessageboxstart($msg.get("login") "")
+###xwikimessageboxstart($msg.get("login") "")
+
+<div class="xwikimessage" style="width: auto; margin-left: 0; margin-right: 0">
+<h3>$msg.get("login")</h3>
 #set($message = $msg.get($xwiki.parseMessage()))
 #if($message)
 <!-- previous login errors -->
 #error($message)
 #end
-<table class="xwikilogintable" summary="$msg.get("loginform")">
-<tr><th><label for="j_username">$msg.get("username"):</label></th>
-<td><input type="text" id="j_username" name="j_username" value=""/></td></tr>
-<tr><th><label for="j_password">$msg.get("password"):</label></th>
-<td><input type="password" id="j_password" name="j_password" value=""/></td></tr>
+<table>
+  <tr>
+  <td>
+    <form id="loginForm" action="$doc.getURL("loginsubmit")" method="post">
+    <div class="hidden"><input type="hidden" name="xredirect" value="$!request.xredirect"/>
+      <input type="hidden" name="authentication_method" value="useraccount"/>
+#if("$!request.srid" != "")
+      <input type="hidden" name="srid" value="$!request.srid"/>
+#end
+    </div>
+
+    <p class="xwikimessage">with your username and password</p>
+    <table class="xwikilogintable" summary="$msg.get("loginform")">
+      <tr><th><label for="j_username">$msg.get("username"):</label></th>
+        <td><input type="text" id="j_username" name="j_username" value=""/></td></tr>
+      <tr><th><label for="j_password">$msg.get("password"):</label></th>
+        <td><input type="password" id="j_password" name="j_password" value=""/></td></tr>
 #if(0)
-<tr><td colspan="2" style="text-align: left;"><input id="remembermeno" type="radio" name="j_rememberme" value="false" checked="checked"/><label for="remembermeno">$msg.get("dontrememberme")</label></td></tr>
-<tr><td colspan="2" style="text-align: left;"><input id="remembermeyes" type="radio" name="j_rememberme" value="true"/><label for="remembermeyes">$msg.get("rememberme")</label></td></tr>
+      <tr><td colspan="2" style="text-align: left;"><input id="remembermeno" type="radio" name="j_rememberme" value="false" checked="checked"/><label for="remembermeno">$msg.get("dontrememberme")</label></td></tr>
+      <tr><td colspan="2" style="text-align: left;"><input id="remembermeyes" type="radio" name="j_rememberme" value="true"/><label for="remembermeyes">$msg.get("rememberme")</label></td></tr>
 #else
-<tr><td colspan="2" style="text-align: left;"><input id="rememberme" type="checkbox" name="j_rememberme" value="true"/><label for="rememberme">$msg.get("remembermeonthiscomp")</label></td></tr>
+      <tr><td colspan="2" style="text-align: left;"><input id="rememberme" type="checkbox" name="j_rememberme" value="true"/><label for="rememberme">$msg.get("remembermeonthiscomp")</label></td></tr>
 #end
+    </table>
+    <div class="buttons"><input type="submit" class="button" value="$msg.get("login")"/></div>
+    </form>
+  </td>
+  <td>
+    <form id="openIDLoginForm" action="$doc.getURL("loginsubmit")" method="post">
+    <div class="hidden"><input type="hidden" name="xredirect" value="$!request.xredirect"/>
+      <input type="hidden" name="authentication_method" value="openid"/>
+#if("$!request.srid" != "")
+      <input type="hidden" name="srid" value="$!request.srid"/>
+#end
+    </div>
+    <p class="xwikimessage">... or with your OpenID</p>
+    <table class="xwikilogintable" summary="$msg.get("loginform")">
+      <tr><th><label for="openid_identifier">$msg.get("openid"):</label></th>
+        <td><input type="text" id="openid_identifier" name="openid_identifier" value="" class="openid_identifier" /></td></tr>
+#if(0)
+      <tr><td colspan="2" style="text-align: left;"><input id="remembermeno" type="radio" name="j_rememberme" value="false" checked="checked"/><label for="remembermeno">$msg.get("dontrememberme")</label></td></tr>
+      <tr><td colspan="2" style="text-align: left;"><input id="remembermeyes" type="radio" name="j_rememberme" value="true"/><label for="remembermeyes">$msg.get("rememberme")</label></td></tr>
+#else
+      <tr><td colspan="2" style="text-align: left;"><input id="rememberme" type="checkbox" name="j_rememberme" value="true"/><label for="rememberme">$msg.get("remembermeonthiscomp")</label></td></tr>
+#end
+    </table>
+    <div class="buttons"><input type="submit" class="button" value="$msg.get("login")"/></div>
+    </form>
+  </td>
+  </tr>
 </table>
-<div class="buttons"><input type="submit" class="button" value="$msg.get("login")"/></div>
-#xwikimessageboxend()
-</form>
 </div>
+
+###xwikimessageboxend()
+
+</div>
 ## Ensure that the username field of the login form has the focus to make it easy for users to log in quickly
 <script type="text/javascript">
 //<![CDATA[
Index: standard/src/main/webapp/templates/registerinline.vm
===================================================================
--- standard/src/main/webapp/templates/registerinline.vm	(revision 11817)
+++ standard/src/main/webapp/templates/registerinline.vm	(working copy)
@@ -1,25 +1,32 @@
 #if(!$xwiki.hasAccessLevel("view","XWiki.Registration")||$xwiki.getDocument("XWiki.Registration").isNew())
   <h1>$msg.get("core.register.title")</h1>
-  #if(!$reg||$reg<0 )
-    <p>$msg.get("core.register.welcome")</p>
-  #end
   #if($reg && $reg<=0)
     #if($reg==-2)
       #error("$msg.get('core.register.passwordMismatch')")
     #elseif($reg==-3)
       #error("$msg.get('core.register.userAlreadyExists')")
+    #elseif($reg==-13)
+      #error("$msg.get('openid.registration.openIdAlreadyRegistered', $openid_identifier)")
     #elseif($reg==-4)
       #error("$msg.get('core.register.invalidUsername')")
+    #elseif($reg==-14)
+      #error("$msg.get('openid.registration.invalidOpenID')")
     #elseif($reg==-8)
       #error("$msg.get('core.register.userAlreadyExists')")
     #else
       #error("$msg.get('core.register.registerFailed', [$reg])")
     #end
-  #elseif($reg)
+  #elseif($reg && $reg != 2 && $reg != 3)
     #set($xwname = "XWiki.${request.xwikiname}")
     #info("$msg.get('core.register.successful', [$xwiki.getUserName($xwname), $request.xwikiname])")
+  #elseif($reg && $reg == 3)
+    #info("$msg.get('openid.registration.successful', [$username, $openid_identifier])")
   #end
   #if(!$reg||$reg<0)
+<table>
+<tr>
+<td>
+    <p>$msg.get("core.register.welcome")</p>
     <form id="register" action="" method="post">
       <div>
         <input type="hidden" name="template" value="XWiki.XWikiUserTemplate" />
@@ -60,7 +67,65 @@
         <span class="buttonwrapper"><input type="submit" value="$msg.get("core.register.submit")"/></span>
       </div>
     </form>
+</td>
+<td>
+<p>$msg.get("openid.registration.welcome")</p>
+    <form id="register" action="" method="post">
+      <div>
+        <input type="hidden" name="template" value="XWiki.XWikiUserTemplate" />
+        <input type="hidden" name="register" value="openid-discover"/>
+        #set($class = $xwiki.getClass("XWiki.XWikiUsers"))
+        #set($obj = $class.newObject())
+        #set($serverobj = $class.newObject())
+        #set($discard = $doc.use("XWiki.XWikiUsers"))
+        <dl>
+          <dt>$msg.get("openid.registration.openid")</dt>
+          <dd><input name="openid_identifier" type="text" /></dd>
+        </dl>
+        <span class="buttonwrapper"><input type="submit" value="$msg.get("openid.registration.discovery_submit")"/></span>
+      </div>
+    </form>
+</td>
+</tr>
+</table>
+  #elseif($reg && $reg == 2)
+<p>$msg.get("openid.registration.confirmation")</p>
+
+    <form id="register" action="" method="post">
+      <div>
+        <input type="hidden" name="template" value="XWiki.XWikiUserTemplate" />
+        <input type="hidden" name="register-confirm" value="1"/>
+        <input type="hidden" name="openid_identifier" value="$!openid_identifier"/>
+        #set($class = $xwiki.getClass("XWiki.XWikiUsers"))
+        #set($obj = $class.newObject())
+        #set($serverobj = $class.newObject())
+        #set($discard = $doc.use("XWiki.XWikiUsers"))
+        #if($first_name)
+          $obj.set("first_name", $first_name)
+        #end
+        #if($last_name)
+          $obj.set("last_name", $last_name)
+        #end
+        <dl>
+          <dt>$msg.get("openid.registration.openid")</dt>
+          <dd>$openid_identifier</dd>
+
+          #set($prop = $class.first_name)
+          <dt>$msg.get("core.register.firstName")</dt>
+          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
+
+          #set($prop = $class.last_name)
+          <dt>$msg.get("core.register.lastName")</dt>
+          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
+
+          #set($prop = $class.email)
+          <dt>$msg.get("core.register.email")</dt>
+          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
+        </dl>
+        <span class="buttonwrapper"><input type="submit" value="$msg.get("openid.registration.confirmation_submit")"/></span>
+      </div>
+    </form>
   #end
 #else
   $xwiki.getDocument("XWiki.Registration").getTranslatedDocument().getRenderedContent()
-#end
\ No newline at end of file
+#end
Index: standard/src/main/webapp/WEB-INF/struts-config.xml
===================================================================
--- standard/src/main/webapp/WEB-INF/struts-config.xml	(revision 11817)
+++ standard/src/main/webapp/WEB-INF/struts-config.xml	(working copy)
@@ -373,6 +373,12 @@
                 name="redirect"
                 scope="request">
         </action>
+        
+        <action path="openidformredirect"
+                type="com.xpn.xwiki.web.OpenIdFormRedirectAction"
+                name="openidformredirect"
+                scope="request">
+        </action>
 
         <action path="/admin/"
                 type="com.xpn.xwiki.web.AdminAction"