diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
index 993f160..c8f9c1d 100644
--- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
@@ -43,25 +43,11 @@
   }
 
   override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
-    val httpRequest  = request.asInstanceOf[HttpServletRequest]
-    val httpResponse = response.asInstanceOf[HttpServletResponse]
-    val context      = request.getServletContext.getContextPath
-    val path         = httpRequest.getRequestURI.substring(context.length)
+    val httpRequest = request.asInstanceOf[HttpServletRequest]
+    val context     = request.getServletContext.getContextPath
+    val path        = httpRequest.getRequestURI.substring(context.length)
 
-    if(path.startsWith("/console/")){
-      val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
-      val baseUrl = this.baseUrl(httpRequest)
-      if(account == null){
-        // Redirect to login form
-        httpResponse.sendRedirect(baseUrl + "/signin?redirect=" + StringUtil.urlEncode(path))
-      } else if(account.isAdmin){
-        // H2 Console (administrators only)
-        chain.doFilter(request, response)
-      } else {
-        // Redirect to dashboard
-        httpResponse.sendRedirect(baseUrl + "/")
-      }
-    } else if(path.startsWith("/git/") || path.startsWith("/git-lfs/")){
+    if(path.startsWith("/git/") || path.startsWith("/git-lfs/")){
       // Git repository
       chain.doFilter(request, response)
     } else {
diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
index 8518b10..e0226ef 100644
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -17,6 +17,8 @@
 import org.scalatra.i18n.Messages
 import com.github.zafarkhaja.semver.{Version => Semver}
 import gitbucket.core.GitBucketCoreModule
+import org.scalatra._
+import org.json4s.jackson.Serialization
 
 import scala.collection.JavaConverters._
 import scala.collection.mutable.ListBuffer
@@ -176,6 +178,42 @@
     html.dbviewer(tables)
   })
 
+  post("/admin/dbviewer/_query")(adminOnly {
+    contentType = formats("json")
+    params.get("query").collectFirst { case query if query.trim.nonEmpty =>
+      val trimmedQuery = query.trim
+      if(trimmedQuery.nonEmpty){
+        try {
+          val conn = request2Session(request).conn
+          using(conn.prepareStatement(query)){ stmt =>
+            if(trimmedQuery.toUpperCase.startsWith("SELECT")){
+              using(stmt.executeQuery()){ rs =>
+                val meta = rs.getMetaData
+                val columns = for(i <- 1 to meta.getColumnCount) yield {
+                  meta.getColumnName(i)
+                }
+                val result = ListBuffer[Map[String, String]]()
+                while(rs.next()){
+                  val row = columns.map { columnName =>
+                    columnName -> Option(rs.getObject(columnName)).map(_.toString).getOrElse("<NULL>")
+                  }.toMap
+                  result += row
+                }
+                Ok(Serialization.write(Map("type" -> "query", "columns" -> columns, "rows" -> result)))
+              }
+            } else {
+              val rows = stmt.executeUpdate()
+              Ok(Serialization.write(Map("type" -> "update", "rows" -> rows)))
+            }
+          }
+        } catch {
+          case e: Exception =>
+            Ok(Serialization.write(Map("type" -> "error", "message" -> e.toString)))
+        }
+      }
+    } getOrElse Ok(Serialization.write(Map("type" -> "error", "message" -> "query is empty")))
+  })
+
   get("/admin/system")(adminOnly {
     html.system(flash.get("info"))
   })
diff --git a/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala b/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
index 6b6ee47..beff25d 100644
--- a/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
@@ -37,7 +37,7 @@
     }
 
     if(!checkPath.startsWith("/upload/") && !checkPath.startsWith("/git/") && !checkPath.startsWith("/git-lfs/") &&
-       !checkPath.startsWith("/plugin-assets/") && !checkPath.startsWith("/console/")){
+       !checkPath.startsWith("/plugin-assets/")){
       filters
         .filter { case (_, path) =>
           val start = path.replaceFirst("/\\*$", "/")
diff --git a/src/main/scala/gitbucket/core/servlet/TransactionFilter.scala b/src/main/scala/gitbucket/core/servlet/TransactionFilter.scala
index 0911d61..d6677d1 100644
--- a/src/main/scala/gitbucket/core/servlet/TransactionFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/TransactionFilter.scala
@@ -23,7 +23,7 @@
 
   def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
     val servletPath = req.asInstanceOf[HttpServletRequest].getServletPath()
-    if(servletPath.startsWith("/assets/")  || servletPath == "/console" || servletPath == "/git" || servletPath == "/git-lfs"){
+    if(servletPath.startsWith("/assets/")  || servletPath == "/git" || servletPath == "/git-lfs"){
       // assets and git-lfs don't need transaction
       chain.doFilter(req, res)
     } else {
diff --git a/src/main/twirl/gitbucket/core/admin/dbviewer.scala.html b/src/main/twirl/gitbucket/core/admin/dbviewer.scala.html
index adf8d02..e0eab7e 100644
--- a/src/main/twirl/gitbucket/core/admin/dbviewer.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/dbviewer.scala.html
@@ -1,17 +1,18 @@
 @(tables: Seq[gitbucket.core.controller.Table])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Database viewer") {
   @gitbucket.core.admin.html.menu("dbviewer") {
-    <div>
+    <div class="container">
       <div class="col-md-3">
         <div id="table-tree">
           <ul>
           @tables.map { table =>
-            <li>@table.name
-            <ul>
-            @table.columns.map { column =>
-              <li>@column.name</li>
-            }
-            </ul>
+            <li data-jstree='{"icon":"@context.path/assets/common/images/table.gif"}'><a href="javascript:void(0);" class="table-link">@table.name</a>
+              <ul>
+              @table.columns.map { column =>
+                <li data-jstree='{"icon":"@context.path/assets/common/images/column.gif"}'>@column.name</li>
+              }
+              </ul>
             </li>
           }
           </ul>
@@ -27,19 +28,60 @@
     </div>
   }
 }
-<script src="@gitbucket.core.view.helpers.assets("/vendors/ace/ace.js")" type="text/javascript" charset="utf-8"></script>
-<script src="@gitbucket.core.view.helpers.assets("/vendors/vakata-jstree-3.3.4/jstree.min.js")" type="text/javascript" charset="utf-8"></script>
-<link rel="stylesheet" href="@gitbucket.core.view.helpers.assets("/vendors/vakata-jstree-3.3.4/themes/default/style.min.css")" />
+<script src="@helpers.assets("/vendors/ace/ace.js")" type="text/javascript" charset="utf-8"></script>
+<script src="@helpers.assets("/vendors/vakata-jstree-3.3.4/jstree.min.js")" type="text/javascript" charset="utf-8"></script>
+<link rel="stylesheet" href="@helpers.assets("/vendors/vakata-jstree-3.3.4/themes/default/style.min.css")" />
 <script>
 $(function(){
   $('#editor').text($('#initial').val());
   var editor = ace.edit("editor");
   editor.setTheme("ace/theme/monokai");
+  editor.getSession().setMode("ace/mode/sql");
+
 
   $('#table-tree').jstree();
 
+  $('.table-link').click(function(e){
+    var query = editor.getValue();
+    if(query != ''){
+      query = query + '\n';
+    }
+    console.log(e);
+    editor.setValue(query + 'SELECT * FROM ' + $(e.target).text());
+  });
+
   $('#run-query').click(function(){
     console.log(editor.getValue());
+    $.post('@context.path/admin/dbviewer/_query', { query: editor.getValue() }, function(data){
+      if(data.type == "query"){
+        var table = $('<table class="table table-bordered table-hover table-scroll">');
+
+        var header = $('<tr>');
+        $.each(data.columns, function(i, column){
+          header.append($('<th>').text(column));
+        });
+        table.append($('<thead>').append(header));
+
+        var body = $('<tbody>');
+        $.each(data.rows, function(i, rs){
+          var row = $('<tr>');
+          $.each(data.columns, function(i, column){
+            row.append($('<td>').text(rs[column]));
+          });
+          body.append(row);
+        });
+
+        table.append(body);
+        $('#result').empty().append(table);
+
+      } else if(data.type == "update"){
+        $('#result').empty().append($('<span>').text('Updated ' + data.rows + ' rows.'));
+
+      } else if(data.type == "error"){
+        $('#result').empty().append($('<span class="error">').text(data.message));
+      }
+    });
+
   });
 });
 </script>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 36b904e..a85da90 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -40,7 +40,7 @@
     <servlet-name>GitRepositoryServlet</servlet-name>
     <servlet-class>gitbucket.core.servlet.GitRepositoryServlet</servlet-class>
   </servlet>
-  
+
   <servlet-mapping>
     <servlet-name>GitRepositoryServlet</servlet-name>
     <url-pattern>/git/*</url-pattern>
@@ -71,30 +71,6 @@
   </servlet-mapping>
 
   <!-- ===================================================================== -->
-  <!-- H2 console configuration -->
-  <!-- ===================================================================== -->
-  <servlet>
-    <servlet-name>H2Console</servlet-name>
-    <servlet-class>org.h2.server.web.WebServlet</servlet-class>
-    <init-param>
-        <param-name>webAllowOthers</param-name>
-        <param-value></param-value>
-    </init-param>
-      <!--
-      <init-param>
-          <param-name>trace</param-name>
-          <param-value></param-value>
-      </init-param>
-      -->
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet-mapping>
-    <servlet-name>H2Console</servlet-name>
-    <url-pattern>/console/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- ===================================================================== -->
   <!-- Session timeout -->
   <!-- ===================================================================== -->
   <session-config>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 73fcfbb..3aca43d 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -124,6 +124,12 @@
   background-color: white;
 }
 
+.table-scroll {
+  display: block;
+  position: relative;
+  overflow: scroll;
+}
+
 /* ======================================================================== */
 /* Global Header */
 /* ======================================================================== */
diff --git a/src/main/webapp/assets/common/images/column.gif b/src/main/webapp/assets/common/images/column.gif
new file mode 100644
index 0000000..e6aeb35
--- /dev/null
+++ b/src/main/webapp/assets/common/images/column.gif
Binary files differ
diff --git a/src/main/webapp/assets/common/images/table.gif b/src/main/webapp/assets/common/images/table.gif
new file mode 100644
index 0000000..e64a80d
--- /dev/null
+++ b/src/main/webapp/assets/common/images/table.gif
Binary files differ