diff --git a/itests/src/test/java/org/apache/karaf/itests/JaasTest.java b/itests/src/test/java/org/apache/karaf/itests/JaasTest.java
index 032b888..63165a0 100644
--- a/itests/src/test/java/org/apache/karaf/itests/JaasTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/JaasTest.java
@@ -13,12 +13,25 @@
  */
 package org.apache.karaf.itests;
 
+import java.io.IOException;
+import javax.inject.Inject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginContext;
+import org.apache.felix.fileinstall.ArtifactInstaller;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.ExamReactorStrategy;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import org.osgi.framework.BundleContext;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(JUnit4TestRunner.class)
@@ -33,4 +46,41 @@ public class JaasTest extends KarafTestSupport {
         assertTrue(listRealmsOutput.contains("PublickeyLoginModule"));
     }
 
+    @Test
+    public void testLoginNoLeak() throws Exception {
+        for (int i = 0; i<200000; i++) {
+            doLogin();
+        }
+    }
+
+    @Inject
+    protected BundleContext bundleContext;
+
+    @Test  // shows the leak afaics
+    public void testLoginSingleReg() throws Exception {
+        for (int i=0; i<10; i++) {
+            doLogin();
+        }
+        assertEquals(2, bundleContext.getServiceReferences(ArtifactInstaller.class.getName(), null).length);
+    }
+
+    private void doLogin() throws Exception {
+        final String userPassRealm = "karaf";
+        LoginContext lc = new LoginContext(userPassRealm, new CallbackHandler() {
+            public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+                for (int i = 0; i < callbacks.length; i++) {
+                    Callback callback = callbacks[i];
+                    if (callback instanceof PasswordCallback) {
+                        PasswordCallback passwordCallback = (PasswordCallback)callback;
+                        passwordCallback.setPassword(userPassRealm.toCharArray());
+                    } else if (callback instanceof NameCallback) {
+                        NameCallback nameCallback = (NameCallback)callback;
+                        nameCallback.setName(userPassRealm);
+                    }
+                }
+            }
+        });
+        lc.login();
+        assertNotNull(lc.getSubject());
+    }
 }
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
index 6cfa6ce..f0c9dba 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
@@ -45,19 +45,12 @@ public class PropertiesLoginModule extends AbstractKarafLoginModule {
 
     private String usersFile;
     
-    private PropertiesInstaller propertiesInstaller;
-    
-    
     public void initialize(Subject sub, CallbackHandler handler, Map sharedState, Map options) {
         super.initialize(sub,handler,options);
         usersFile = (String) options.get(USER_FILE);
         if (debug) {
             LOG.debug("Initialized debug=" + debug + " usersFile=" + usersFile);
         }
-        propertiesInstaller = new PropertiesInstaller(this, usersFile);
-        if (this.bundleContext != null) {
-            this.bundleContext.registerService("org.apache.felix.fileinstall.ArtifactInstaller", propertiesInstaller, null);
-        }       
     }
 
     public boolean login() throws LoginException {