diff --git a/deployed/mod_login2/modules/mod_login2/helper.php b/deployed/mod_login2/modules/mod_login2/helper.php
new file mode 100644
index 00000000..1e2b3e68
--- /dev/null
+++ b/deployed/mod_login2/modules/mod_login2/helper.php
@@ -0,0 +1,75 @@
+getMenu()->getItem($params->get($type));
+
+ // Stay on the same page
+ $url = JUri::getInstance()->toString();
+
+ if ($item)
+ {
+ $lang = '';
+
+ if ($item->language !== '*' && JLanguageMultilang::isEnabled())
+ {
+ $lang = '&lang=' . $item->language;
+ }
+
+ $url = 'index.php?Itemid=' . $item->id . $lang;
+ }
+
+ return base64_encode($url);
+ }
+
+ /**
+ * Returns the current users type
+ *
+ * @return string
+ */
+ public static function getType()
+ {
+ $user = JFactory::getUser();
+
+ return (!$user->get('guest')) ? 'logout' : 'login';
+ }
+
+ /**
+ * Get list of available two factor methods
+ *
+ * @return array
+ *
+ * @deprecated 4.0 Use JAuthenticationHelper::getTwoFactorMethods() instead.
+ */
+ public static function getTwoFactorMethods()
+ {
+ JLog::add(__METHOD__ . ' is deprecated, use JAuthenticationHelper::getTwoFactorMethods() instead.', JLog::WARNING, 'deprecated');
+
+ return JAuthenticationHelper::getTwoFactorMethods();
+ }
+}
diff --git a/deployed/mod_login2/modules/mod_login2/mod_login.php b/deployed/mod_login2/modules/mod_login2/mod_login.php
new file mode 100644
index 00000000..7996c0b3
--- /dev/null
+++ b/deployed/mod_login2/modules/mod_login2/mod_login.php
@@ -0,0 +1,29 @@
+def('greeting', 1);
+
+$type = ModLoginHelper::getType();
+$return = ModLoginHelper::getReturnUrl($params, $type);
+$twofactormethods = JAuthenticationHelper::getTwoFactorMethods();
+$user = JFactory::getUser();
+$layout = $params->get('layout', 'default');
+
+// Logged users must load the logout sublayout
+if (!$user->guest)
+{
+ $layout .= '_logout';
+}
+
+require JModuleHelper::getLayoutPath('mod_login', $layout);
diff --git a/deployed/mod_login2/modules/mod_login2/mod_login.xml b/deployed/mod_login2/modules/mod_login2/mod_login.xml
new file mode 100644
index 00000000..148a4968
--- /dev/null
+++ b/deployed/mod_login2/modules/mod_login2/mod_login.xml
@@ -0,0 +1,169 @@
+
+