diff --git a/.project b/.project
new file mode 100644
index 0000000..82178c9
--- /dev/null
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ldap</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.editor.php.aptanaPhpBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.editor.php.phpNature</nature>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/com.aptana.editor.php.prefs b/.settings/com.aptana.editor.php.prefs
new file mode 100644
index 0000000..a228296
--- /dev/null
+++ b/.settings/com.aptana.editor.php.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+phpVersion=php5.3
diff --git a/ldap_sso/ldap_sso.module b/ldap_sso/ldap_sso.module
index 0cf7a35..7d719d0 100644
--- a/ldap_sso/ldap_sso.module
+++ b/ldap_sso/ldap_sso.module
@@ -265,6 +265,10 @@
       ),
       'sso_login' => TRUE,
     );
+    
+    // Overwrite global user object to login
+    global $user;
+    
     $user = ldap_authentication_user_login_authenticate_validate(array(), $fake_form_state, TRUE);
 
     if ($detailed_watchdog_log) {
@@ -287,6 +291,11 @@
       if ($detailed_watchdog_log) {
         watchdog('ldap_authentication', 'ldap_sso_user_login_sso.remote_user.user_success.drupal_goto front', $watchdog_tokens, WATCHDOG_DEBUG);
       }
+      
+      // Finalize login
+      $login_array = array ('name' => $user->name);
+      user_login_finalize($login_array);
+      
       drupal_goto('<front>');
     }
     else {