diff --git a/core/css/styles.css b/core/css/styles.css
index 481443a19b..cc600cc64f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -211,6 +211,10 @@ fieldset.warning {
 }
 fieldset.warning legend { color:#b94a48 !important; }
 
+/* Alternative Logins */
+#alternative-logins legend { margin-bottom:10px; }
+#alternative-logins li { height:40px; display:inline-block; white-space:nowrap; }
+
 
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation {
diff --git a/core/templates/login.php b/core/templates/login.php
index 59b685eabf..ed9aaba8a4 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -43,5 +43,19 @@
 		<input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
 	</fieldset>
 </form>
-<?php OCP\Util::addscript('core', 'visitortimezone'); ?>
+<?php if (!empty($_['alt_login'])) { ?>
+<form id="alternative-logins">
+	<fieldset>
+		<legend><?php echo $l->t('Alternative Logins') ?></legend>
+		<ul>
+			<? foreach($_['alt_login'] as $login): ?>
+				<li><a class="button" href="<?php echo $login['href']; ?>" ><?php echo $login['name']; ?></a></li>
+				<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</form>
+<?php } ?>
+
+<?php
+OCP\Util::addscript('core', 'visitortimezone');
 
diff --git a/lib/app.php b/lib/app.php
index fa3e14ce4d..3a4e21e8cd 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -36,6 +36,7 @@ class OC_App{
 	static private $appTypes = array();
 	static private $loadedApps = array();
 	static private $checkedApps = array();
+	static private $altLogin = array();
 
 	/**
 	 * @brief loads all apps
@@ -568,6 +569,14 @@ class OC_App{
 		self::$personalForms[]= $app.'/'.$page.'.php';
 	}
 
+	public static function registerLogIn($entry) {
+		self::$altLogin[] = $entry;
+	}
+
+	public static function getAlternativeLogIns() {
+		return self::$altLogin;
+	}
+
 	/**
 	 * @brief: get a list of all apps in the apps folder
 	 * @return array or app names (string IDs)
diff --git a/lib/util.php b/lib/util.php
index 4932be2d6c..5983c34e76 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -300,6 +300,8 @@ class OC_Util {
 			$redirect_url = OC_Util::sanitizeHTML($_REQUEST['redirect_url']);
 			$parameters['redirect_url'] = urlencode($redirect_url);
 		}
+
+		$parameters['alt_login'] = OC_App::getAlternativeLogIns();
 		OC_Template::printGuestPage("", "login", $parameters);
 	}