diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
index a82d5bf0e79..3b42752d50e 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
@@ -205,10 +205,10 @@ public Builder setDependencyResolver(DependencyResolver dependencyResolver) {
       return this;
     }
 
-//    public Builder setInterpreterRunner(InterpreterRunner runner) {
-//      interpreterSetting.interpreterRunner = runner;
-//      return this;
-//    }
+    public Builder setInterpreterRunner(InterpreterRunner runner) {
+      interpreterSetting.interpreterRunner = runner;
+      return this;
+    }
 
     public Builder setIntepreterSettingManager(
         InterpreterSettingManager interpreterSettingManager) {
@@ -248,7 +248,6 @@ public InterpreterSetting() {
   }
 
   void postProcessing() {
-//    createLauncher();
     this.status = Status.READY;
   }
 
@@ -370,7 +369,7 @@ public ManagedInterpreterGroup getOrCreateInterpreterGroup(String user, String n
     try {
       interpreterGroupWriteLock.lock();
       if (!interpreterGroups.containsKey(groupId)) {
-        LOGGER.info("Create InterpreterGroup with groupId {} for user {} and note {}",
+        LOGGER.info("Create InterpreterGroup with groupId: {} for user: {} and note: {}",
             groupId, user, noteId);
         ManagedInterpreterGroup intpGroup = createInterpreterGroup(groupId);
         interpreterGroups.put(groupId, intpGroup);
@@ -653,7 +652,7 @@ synchronized RemoteInterpreterProcess createInterpreterProcess() throws IOExcept
     return process;
   }
 
-  private List<Interpreter> getOrCreateSession(String user, String noteId) {
+  List<Interpreter> getOrCreateSession(String user, String noteId) {
     ManagedInterpreterGroup interpreterGroup = getOrCreateInterpreterGroup(user, noteId);
     Preconditions.checkNotNull(interpreterGroup, "No InterpreterGroup existed for user {}, " +
         "noteId {}", user, noteId);
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
index f34195d706b..abaf6349f06 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
@@ -782,13 +782,7 @@ public void restart(String settingId, String noteId, String user) throws Interpr
         //clean up metaInfos
         intpSetting.setInfos(null);
         copyDependenciesFromLocalPath(intpSetting);
-
-        if (user.equals("anonymous")) {
-          intpSetting.close();
-        } else {
-          intpSetting.closeInterpreters(user, noteId);
-        }
-
+        intpSetting.closeInterpreters(user, noteId);
       } else {
         throw new InterpreterException("Interpreter setting id " + settingId + " not found");
       }
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java
index ff9cb1c47f8..96f01952f9f 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java
@@ -85,7 +85,7 @@ public synchronized void close(String sessionId) {
     close(sessions.remove(sessionId));
     //TODO(zjffdu) whether close InterpreterGroup if there's no session left in Zeppelin Server
     if (sessions.isEmpty() && interpreterSetting != null) {
-      LOGGER.info("Remove this InterpreterGroup {} as all the sessions are closed", id);
+      LOGGER.info("Remove this InterpreterGroup: {} as all the sessions are closed", id);
       interpreterSetting.removeInterpreterGroup(id);
       if (remoteInterpreterProcess != null) {
         LOGGER.info("Kill RemoteIntetrpreterProcess");
@@ -133,7 +133,7 @@ public synchronized List<Interpreter> getOrCreateSession(String user, String ses
       for (Interpreter interpreter : interpreters) {
         interpreter.setInterpreterGroup(this);
       }
-      LOGGER.info("Create Session {} in InterpreterGroup {} for user {}", sessionId, id, user);
+      LOGGER.info("Create Session: {} in InterpreterGroup: {} for user: {}", sessionId, id, user);
       sessions.put(sessionId, interpreters);
       return interpreters;
     }
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
index 605476fe32d..19f16f53b9d 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
@@ -34,6 +34,7 @@
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -181,9 +182,6 @@ public void testCreateUpdateRemoveSetting() throws IOException, InterpreterExcep
     // only close user1's session
     interpreterSettingManager.restart(interpreterSetting.getId(), "note1", "user1");
     assertEquals(2, interpreterGroup.getSessionNum());
-    // close all the sessions
-    interpreterSettingManager.restart(interpreterSetting.getId(), "note1", "anonymous");
-    assertEquals(0, interpreterGroup.getSessionNum());
 
     // remove interpreter setting
     interpreterSettingManager.remove(interpreterSetting.getId());
@@ -281,6 +279,79 @@ public void testGetEditor() throws IOException {
     Interpreter mock1Interpreter = interpreterFactory.getInterpreter("user1", "note1", "mock1");
     editor = interpreterSettingManager.getEditorSetting(mock1Interpreter,"user1", "note1", "mock1");
     assertEquals("text", editor.get("language"));
+  }
+
+  @Test
+  public void testRestartShared() throws InterpreterException {
+    InterpreterSetting interpreterSetting = interpreterSettingManager.getByName("test");
+    interpreterSetting.getOption().setPerUser("shared");
+    interpreterSetting.getOption().setPerNote("shared");
+
+    interpreterSetting.getOrCreateSession("user1", "note1");
+    interpreterSetting.getOrCreateInterpreterGroup("user2", "note2");
+    assertEquals(1, interpreterSetting.getAllInterpreterGroups().size());
+
+    interpreterSettingManager.restart(interpreterSetting.getId(), "user1", "note1");
+    assertEquals(0, interpreterSetting.getAllInterpreterGroups().size());
+  }
+
+  @Test
+  public void testRestartPerUserIsolated() throws InterpreterException {
+    InterpreterSetting interpreterSetting = interpreterSettingManager.getByName("test");
+    interpreterSetting.getOption().setPerUser("isolated");
+    interpreterSetting.getOption().setPerNote("shared");
+
+    interpreterSetting.getOrCreateSession("user1", "note1");
+    interpreterSetting.getOrCreateSession("user2", "note2");
+    assertEquals(2, interpreterSetting.getAllInterpreterGroups().size());
+
+    interpreterSettingManager.restart(interpreterSetting.getId(), "note1", "user1");
+    assertEquals(1, interpreterSetting.getAllInterpreterGroups().size());
+  }
+
+  @Test
+  public void testRestartPerNoteIsolated() throws InterpreterException {
+    InterpreterSetting interpreterSetting = interpreterSettingManager.getByName("test");
+    interpreterSetting.getOption().setPerUser("shared");
+    interpreterSetting.getOption().setPerNote("isolated");
 
+    interpreterSetting.getOrCreateSession("user1", "note1");
+    interpreterSetting.getOrCreateSession("user2", "note2");
+    assertEquals(2, interpreterSetting.getAllInterpreterGroups().size());
+
+    interpreterSettingManager.restart(interpreterSetting.getId(), "note1", "user1");
+    assertEquals(1, interpreterSetting.getAllInterpreterGroups().size());
+  }
+
+  @Test
+  public void testRestartPerUserScoped() throws InterpreterException {
+    InterpreterSetting interpreterSetting = interpreterSettingManager.getByName("test");
+    interpreterSetting.getOption().setPerUser("scoped");
+    interpreterSetting.getOption().setPerNote("shared");
+
+    interpreterSetting.getOrCreateSession("user1", "note1");
+    interpreterSetting.getOrCreateSession("user2", "note2");
+    assertEquals(1, interpreterSetting.getAllInterpreterGroups().size());
+    assertEquals(2, interpreterSetting.getAllInterpreterGroups().get(0).getSessionNum());
+
+    interpreterSettingManager.restart(interpreterSetting.getId(), "note1", "user1");
+    assertEquals(1, interpreterSetting.getAllInterpreterGroups().size());
+    assertEquals(1, interpreterSetting.getAllInterpreterGroups().get(0).getSessionNum());
+  }
+
+  @Test
+  public void testRestartPerNoteScoped() throws InterpreterException {
+    InterpreterSetting interpreterSetting = interpreterSettingManager.getByName("test");
+    interpreterSetting.getOption().setPerUser("shared");
+    interpreterSetting.getOption().setPerNote("scoped");
+
+    interpreterSetting.getOrCreateSession("user1", "note1");
+    interpreterSetting.getOrCreateSession("user2", "note2");
+    assertEquals(1, interpreterSetting.getAllInterpreterGroups().size());
+    assertEquals(2, interpreterSetting.getAllInterpreterGroups().get(0).getSessionNum());
+
+    interpreterSettingManager.restart(interpreterSetting.getId(), "note1", "user1");
+    assertEquals(1, interpreterSetting.getAllInterpreterGroups().size());
+    assertEquals(1, interpreterSetting.getAllInterpreterGroups().get(0).getSessionNum());
   }
 }