diff --git a/_config.php b/_config.php
index 377273d71..f8933259c 100644
--- a/_config.php
+++ b/_config.php
@@ -22,34 +22,11 @@
 $path = Director::baseFolder().'/sapphire/parsers/';
 set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 
-
-/**
- * Define the random number generator for the OpenID library
- *
- * To set a source of randomness, define {@link Auth_OpenID_RAND_SOURCE}
- * to the path to the randomness source. If your platform does not provide a
- * secure randomness source, the library can operate in pseudorandom mode,
- * but it is then vulnerable to theoretical attacks.
- * If you wish to operate in pseudorandom mode, define
- * {@link Auth_OpenID_RAND_SOURCE} to null.
- * On a Unix-like platform  (including MacOS X), try "/dev/random" and
- * "/dev/urandom".
- */
-define('Auth_OpenID_RAND_SOURCE', null);
-
-
-
 /**
  * Register the {@link OpenIDAuthenticator OpenID authenticator}
  */
 Authenticator::register_authenticator('MemberAuthenticator');
 
-
-/**
- * Register the {@link OpenIDAuthenticator OpenID authenticator}
- */
-Authenticator::register_authenticator('OpenIDAuthenticator');
-
 /**
  * Define a default language different than english
  */
diff --git a/lang/de_DE.php b/lang/de_DE.php
index 1b71e270e..1379ffaed 100644
--- a/lang/de_DE.php
+++ b/lang/de_DE.php
@@ -218,10 +218,6 @@ $lang['de_DE']['BasicAuth']['ERRORNOTREC'] = 'Dieser/s  Nutzername/Passwort wurd
 $lang['de_DE']['BasicAuth']['ENTERINFO'] = 'Bitte geben Sie einen Nutzernamen und ein Passwort ein';
 $lang['de_DE']['BasicAuth']['ERRORNOTADMIN'] = 'Dieser Nutzer ist kein Administrator';
 $lang['de_DE']['MemberAuthenticator']['TITLE'] = 'Email & Passwort';
-$lang['de_DE']['Security']['OPENIDHEADER'] = 'OpenID/i-name Beglaubigung';
-$lang['de_DE']['Security']['OPENIDDESC'] = '<p> Stellen Sie sicher, dass Sie die normierte OpenID/i-name eingegeben haben, z.B. mit Protokoll und abschliessenem Slash für OpenID (Beispiel: http://openid.silverstripe.com/ ). <p>';
-$lang['de_DE']['Security']['OPENIDURL'] = 'OpenID URL/i-name';
-$lang['de_DE']['Security']['MEMBERALREADYEXISTS'] = 'Es gibt bereits ein Mitglied mit dieser Identifizierungs-URL';
 $lang['de_DE']['Security']['NOTEPAGESECURED'] = 'Diese Seite ist gesichert. Geben sie Ihre Beglaubigung unten ein und wir werden Sie weiterleiten';
 $lang['de_DE']['Security']['ALREADYLOGGEDIN'] = 'Sie haben keinen Zugriff auf diese Seite. Whenn Sie ein anderes Konto besitzen mit dem Sie auf diese Seite zugreifen können melden Sie sich unten an.';
 $lang['de_DE']['Security']['LOGGEDOUT'] = 'Sie wurden ausgeloggt. Wenn Sie sich wieder einloggen möchten geben Sie ihre Beglaubigung unten an.';
@@ -234,14 +230,6 @@ $lang['de_DE']['Security']['CHANGEPASSWORDHEADER'] = 'Passwort ändern';
 $lang['de_DE']['Security']['ENTERNEWPASSWORD'] = 'Bitte geben Sie ein neues Passwort ein';
 $lang['de_DE']['Security']['CHANGEPASSWORDBELOW'] = 'Sie können Ihr Passwort unten ändern.';
 $lang['de_DE']['Security']['ERRORPASSWORDPERMISSION'] = 'Sie müssen eingeloggt sein um Ihr Passwort zu ändern!';
-$lang['de_DE']['OpenIDAuthenticator']['ERRORCRED'] = 'Bitte geben Sie ihre OpenID URL oder ihren i-name ein.';
-$lang['de_DE']['OpenIDAuthenticator']['TRANSACTIONINPROGRESS'] = 'OpenID Anfrage in Arbeit';
-$lang['de_DE']['OpenIDAuthenticator']['VERIFICATIONCANCELLED'] = 'Die Überprüfung wurde abgebrochen. Bitte versuchen Sie es erneut.';
-$lang['de_DE']['OpenIDAuthenticator']['AUTHFAILED'] = 'Die OpenID/i-name Authentifizierung ist gescheitert.';
-$lang['de_DE']['OpenIDAuthenticator']['LOGINFAILED'] = 'Login gescheitert. Bitte versuchen Sie es erneut.';
-$lang['de_DE']['OpenIDLoginForm']['DESC'] = '<div id="OpenIDDescription"><p>OpenID ist ein internetweites Identifizierungssystem, das es Ihnen erlaubt sich auf mehreren Websites mit einem einzigen Konto anzumelden. Für weitergehenden Informationen besuchen Sie bitte  
-<a href="http://openid.net">openid.net</a>.</p></div>';
-$lang['de_DE']['OpenIDLoginForm']['URL'] = 'OpenID URL';
 $lang['de_DE']['ComplexTableField.ss']['SORTASC'] = 'Auftsteigen sortieren';
 $lang['de_DE']['ComplexTableField.ss']['SORTDESC'] = 'Absteigend sortieren';
 $lang['de_DE']['ComplexTableField.ss']['SHOW'] = 'anzeigen';
diff --git a/lang/en_US.php b/lang/en_US.php
index a0786588e..4292f840a 100644
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -27,7 +27,7 @@ $lang['en_US']['ImageUploader']['DELETE'] = array(
 );
 $lang['en_US']['ImageUploader']['CLICKREMOVE'] = array(
 	'Click the button below to remove this %s.',
-	
+	
 								PR_MEDIUM,
 	'... this image/file'
 );
@@ -62,7 +62,7 @@ $lang['en_US']['SiteTree']['METADESC'] = 'Description';
 $lang['en_US']['SiteTree']['METAKEYWORDS'] = 'Keywords';
 $lang['en_US']['SiteTree']['METAADVANCEDHEADER'] = 'Advanced Options...';
 $lang['en_US']['SiteTree']['METAEXTRA'] = 'Custom Meta Tags';
-$lang['en_US']['SiteTree']['METANOTEPRIORITY'] = 'Manually specify a Priority for this page: 
+$lang['en_US']['SiteTree']['METANOTEPRIORITY'] = 'Manually specify a Priority for this page: 
 											(valid values are from 0 to 1, a zero will remove this page from the index)';
 $lang['en_US']['SiteTree']['METAPAGEPRIO'] = 'Page Priority';
 $lang['en_US']['SiteTree']['PAGETYPE'] = array(
@@ -73,7 +73,7 @@ $lang['en_US']['SiteTree']['PAGETYPE'] = array(
 $lang['en_US']['SiteTree']['SHOWINMENUS'] = 'Show in menus?';
 $lang['en_US']['SiteTree']['SHOWINSEARCH'] = 'Show in search?';
 $lang['en_US']['SiteTree']['ALLOWCOMMENTS'] = 'Allow comments on this page?';
-$lang['en_US']['SiteTree']['NOTEUSEASHOMEPAGE'] = 'Use this page as the \'home page\' for the following domains: 
+$lang['en_US']['SiteTree']['NOTEUSEASHOMEPAGE'] = 'Use this page as the \'home page\' for the following domains: 
 							(separate multiple domains with commas)';
 $lang['en_US']['SiteTree']['HOMEPAGEFORDOMAIN'] = array(
 	'Domain(s)',
@@ -298,21 +298,6 @@ $lang['en_US']['Member']['BUTTONLOGIN'] = 'Log in';
 $lang['en_US']['Member']['BUTTONLOSTPASSWORD'] = 'I\'ve lost my password';
 $lang['en_US']['Member']['LOGGEDINAS'] = 'You\'re logged in as %s.';
 $lang['en_US']['Member']['WELCOMEBACK'] = 'Welcome Back, %s';
-$lang['en_US']['Security']['OPENIDHEADER'] = 'OpenID/i-name credentials';
-$lang['en_US']['Security']['OPENIDDESC'] = '<p>Make sure you enter your normalized OpenID/i-name credentials 
-				here, i.e. with protocol and trailing slash for OpenID (e.g. http://openid.silverstripe.com/).</p>';
-$lang['en_US']['Security']['OPENIDURL'] = 'OpenID URL/i-name';
-$lang['en_US']['Security']['MEMBERALREADYEXISTS'] = 'There already exists a member with this identity URL';
-$lang['en_US']['OpenIDAuthenticator']['ERRORCRED'] = 'Please enter your OpenID URL or your i-name.';
-$lang['en_US']['OpenIDAuthenticator']['TRANSACTIONINPROGRESS'] = 'OpenID transaction in progress';
-$lang['en_US']['OpenIDAuthenticator']['VERIFICATIONCANCELLED'] = 'The verification was cancelled. Please try again.';
-$lang['en_US']['OpenIDAuthenticator']['AUTHFAILED'] = 'The OpenID/i-name authentication failed.';
-$lang['en_US']['OpenIDAuthenticator']['LOGINFAILED'] = 'Login failed. Please try again.';
-$lang['en_US']['OpenIDLoginForm']['DESC'] = '<div id="OpenIDDescription"><p>OpenID is an Internet-wide identity system
-		  					that allows you to sign in to many websites with a single account.
-							For more information visit <a href="http://openid.net">openid.net</a>.</p></div>
-						';
-$lang['en_US']['OpenIDLoginForm']['URL'] = 'OpenID URL';
 $lang['en_US']['Security']['NOTEPAGESECURED'] = 'That page is secured. Enter your credentials below and we will send you right along.';
 $lang['en_US']['Security']['ALREADYLOGGEDIN'] = 'You don\'t have access to this page.  If you have another account that can access that page, you can log in below.';
 $lang['en_US']['Security']['LOGGEDOUT'] = 'You have been logged out.  If you would like to log in again, enter your credentials below.';
diff --git a/lang/nl_NL.php b/lang/nl_NL.php
index bece865c9..8f3711990 100644
--- a/lang/nl_NL.php
+++ b/lang/nl_NL.php
@@ -297,20 +297,6 @@ $lang['nl_NL']['Member']['BUTTONLOGIN'] = 'Inloggen';
 $lang['nl_NL']['Member']['BUTTONLOSTPASSWORD'] = 'Ik ben mijn wachtwoord vergeten...';
 $lang['nl_NL']['Member']['LOGGEDINAS'] = 'Je bent ingelogd als %s.';
 $lang['nl_NL']['Member']['WELCOMEBACK'] = 'Welkom Terug, %s';
-$lang['nl_NL']['Security']['OPENIDHEADER'] = 'OpenID/i-name gegevens';
-$lang['nl_NL']['Security']['OPENIDDESC'] = '<p>Make sure you enter your normalized OpenID/i-name credentials here, i.e. with protocol and trailing slash for OpenID (e.g. http://openid.silverstripe.com/).</p>';
-$lang['nl_NL']['Security']['OPENIDURL'] = 'OpenID URL/i-name';
-$lang['nl_NL']['Security']['MEMBERALREADYEXISTS'] = 'Er bestaat reeds een gebruiker met deze OpenID URL';
-$lang['nl_NL']['OpenIDAuthenticator']['ERRORCRED'] = 'Vul jouw OpenID URL of i-name in.';
-$lang['nl_NL']['OpenIDAuthenticator']['TRANSACTIONINPROGRESS'] = 'OpenID transactie wordt uitgevoerd';
-$lang['nl_NL']['OpenIDAuthenticator']['VERIFICATIONCANCELLED'] = 'De verificatie is geannuleerd. Probeer het opnieuw.';
-$lang['nl_NL']['OpenIDAuthenticator']['AUTHFAILED'] = 'De OpenID/i-name authenticatie is mislukt.';
-$lang['nl_NL']['OpenIDAuthenticator']['LOGINFAILED'] = 'Het inloggen is mislukt. Probeer het opnieuw.';
-$lang['nl_NL']['OpenIDLoginForm']['DESC'] = '<div id="OpenIDDescription"><p>OpenID is een Internet-wide identity system
-		  					that allows you to sign in to many websites with a single account.
-							For more information visit <a href="http://openid.net">openid.net</a>.</p></div>
-						';
-$lang['nl_NL']['OpenIDLoginForm']['URL'] = 'OpenID URL';
 $lang['nl_NL']['Security']['NOTEPAGESECURED'] = 'Deze pagina is beveiligd. Voer je gegevens in en je wordt automatisch doorgestuurd.';
 $lang['nl_NL']['Security']['ALREADYLOGGEDIN'] = 'Je hebt geen toegangsrechten om deze pagina\'s te kunnen benaderen.  Als je een ander account hebt welke deze rechten wel heeft dan kun je hier beneden inloggen.';
 $lang['nl_NL']['Security']['LOGGEDOUT'] = 'Je bent uitgelogd.  Als je weer wilt inloggen kun je gegevens hier beneden invoeren.';
diff --git a/lang/zh_CN.php b/lang/zh_CN.php
index f11fb1abf..ca9bb5a23 100644
--- a/lang/zh_CN.php
+++ b/lang/zh_CN.php
@@ -223,10 +223,6 @@ $lang['zh_CN']['BasicAuth']['ENTERINFO'] = '请输入用户名和密码';
 $lang['zh_CN']['BasicAuth']['ERRORNOTADMIN'] = '此用户没有管理员权限。';
 $lang['zh_CN']['']['WELCOME'] = '欢迎';
 $lang['zh_CN']['MemberAuthenticator']['TITLE'] = '电邮地址和密码';
-$lang['zh_CN']['Security']['OPENIDHEADER'] = '开放系统身份（OpenID）/i-name登录信息';
-$lang['zh_CN']['Security']['OPENIDDESC'] = '<p>请确认您在此输入您标准化的开放系统身份（OpenID）/i-name登录信息，亦即,带有协议及尾随斜杠（例如，http://openid.silverstripe.com/）。</p>';
-$lang['zh_CN']['Security']['OPENIDURL'] = '开放系统身份（OpenID）的URL/i-name';
-$lang['zh_CN']['Security']['MEMBERALREADYEXISTS'] = '已有会员占用了此身份认证URL';
 $lang['zh_CN']['Security']['NOTEPAGESECURED'] = '此页是受安全保护的。输入您的登录信息，我们会将您送达。';
 $lang['zh_CN']['Security']['ALREADYLOGGEDIN'] = '您无访问此页的权限。如果您拥有另一个可访问次页的帐户，请在下面登录。';
 $lang['zh_CN']['Security']['LOGGEDOUT'] = '您已被撤消登录。如果您想再次登录，在下面输入您的登录信息。';
@@ -239,13 +235,6 @@ $lang['zh_CN']['Security']['CHANGEPASSWORDHEADER'] = '更改您的密码';
 $lang['zh_CN']['Security']['ENTERNEWPASSWORD'] = '请输入新密码';
 $lang['zh_CN']['Security']['CHANGEPASSWORDBELOW'] = '您可在下面更改您的密码';
 $lang['zh_CN']['Security']['ERRORPASSWORDPERMISSION'] = '您必需登录以更改您的密码';
-$lang['zh_CN']['OpenIDAuthenticator']['ERRORCRED'] = '请输入您的开放系统身份（OpenID）或您的i-name';
-$lang['zh_CN']['OpenIDAuthenticator']['TRANSACTIONINPROGRESS'] = '开放系统身份（OpenID）正在认证中';
-$lang['zh_CN']['OpenIDAuthenticator']['VERIFICATIONCANCELLED'] = '验证被取消。请重试。';
-$lang['zh_CN']['OpenIDAuthenticator']['AUTHFAILED'] = '开放系统身份（OpenID）/i-name认证失败。';
-$lang['zh_CN']['OpenIDAuthenticator']['LOGINFAILED'] = '登录失败。请重试。';
-$lang['zh_CN']['OpenIDLoginForm']['DESC'] = '<div id="开放系统身份描述“><p>开放系统身份是一个互联网范围内的身份认证系统，他允许您用单一帐户注册登录许多网站。更多信息，访问<a href="http://openid.net">openid.net</a>.</p></div>';
-$lang['zh_CN']['OpenIDLoginForm']['URL'] = '开放系统身份（OpenID）的URL';
 $lang['zh_CN']['ComplexTableField.ss']['SORTASC'] = '递增排序';
 $lang['zh_CN']['ComplexTableField.ss']['SORTDESC'] = '递减排序';
 $lang['zh_CN']['ComplexTableField.ss']['ADDITEM'] = '新加';