keycloak-aplcache

diff --git a/services/src/main/java/org/keycloak/services/resources/AccountService.java b/services/src/main/java/org/keycloak/services/resources/AccountService.java
index 30428af..96f8564 100644
--- a/services/src/main/java/org/keycloak/services/resources/AccountService.java
+++ b/services/src/main/java/org/keycloak/services/resources/AccountService.java
@@ -182,8 +182,6 @@ public class AccountService {
 
                     realm.updateCredential(user, credentials);
 
-                    authManager.expireIdentityCookie(realm, uriInfo);
-
                     return Flows.forms(realm, request).setUser(user).forwardToPassword();
                 } else {
                     return Response.status(Status.FORBIDDEN).build();

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/AccountTest.java b/testsuite/src/test/java/org/keycloak/testsuite/AccountTest.java
new file mode 100644
index 0000000..17ba285
--- /dev/null
+++ b/testsuite/src/test/java/org/keycloak/testsuite/AccountTest.java
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.keycloak.testsuite;
+
+import org.jboss.arquillian.junit.Arquillian;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+@RunWith(Arquillian.class)
+public class AccountTest extends AbstractDroneTest {
+
+    @Test
+    public void changePassword() {
+        registerUser("changePassword", "password");
+
+        selenium.open(authServerUrl + "/rest/realms/demo/account/password");
+        selenium.waitForPageToLoad("10000");
+
+        Assert.assertTrue(selenium.isTextPresent("Change Password"));
+
+        selenium.type("id=password", "password");
+        selenium.type("id=password-new", "newpassword");
+        selenium.type("id=password-confirm", "newpassword");
+        selenium.click("css=input[type=\"submit\"]");
+        selenium.waitForPageToLoad("30000");
+
+        logout();
+
+        login("changePassword", "password", "Invalid username or password");
+        login("changePassword", "newpassword");
+    }
+
+}