diff --git a/admin/ajax/disableapp.php b/admin/ajax/disableapp.php
new file mode 100644
index 0000000000..d23f8de7ef
--- /dev/null
+++ b/admin/ajax/disableapp.php
@@ -0,0 +1,9 @@
+<?php
+
+// Init owncloud
+require_once('../../lib/base.php');
+header( "Content-Type: application/jsonrequest" );
+
+OC_APP::disable($_POST['appid']);
+
+?>
diff --git a/admin/ajax/enableapp.php b/admin/ajax/enableapp.php
new file mode 100644
index 0000000000..d988d7fd2d
--- /dev/null
+++ b/admin/ajax/enableapp.php
@@ -0,0 +1,9 @@
+<?php
+
+// Init owncloud
+require_once('../../lib/base.php');
+header( "Content-Type: application/jsonrequest" );
+
+OC_APP::enable($_POST['appid']);
+
+?>
diff --git a/admin/apps.php b/admin/apps.php
index 725128a752..5eec7e626d 100644
--- a/admin/apps.php
+++ b/admin/apps.php
@@ -30,6 +30,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
 
 // Load the files we need
 OC_UTIL::addStyle( "admin", "apps" );
+OC_UTIL::addScript( "admin", "apps" );
 
 
 if(isset($_GET['id']))  $id=$_GET['id']; else $id=0;
@@ -42,7 +43,6 @@ if($installed){
 	$records = array();
 
 	OC_APP::setActiveNavigationEntry( "core_apps_installed" );
-	echo count($apps);
 	foreach($apps as $app){
 		$info=OC_APP::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml");
 		$record = array( 'id' => $app,
diff --git a/admin/js/apps.js b/admin/js/apps.js
new file mode 100644
index 0000000000..4d8c68171b
--- /dev/null
+++ b/admin/js/apps.js
@@ -0,0 +1,17 @@
+$("div[x-use='appenableddiv']").live( "click", function(){
+	appid = $(this).parent().parent().attr("x-uid");
+
+	if($(this).text() == "enabled"){
+		$(this).html( "disabled" );
+		$(this).parent().removeClass( "enabled" );
+		$(this).parent().addClass( "disabled" );
+		//$.post( "ajax/disableapp.php", $(appid).serialize(), function(data){} );
+		$.post( "ajax/disableapp.php", { appid: appid }, function(data){ alert(data.status);});
+	}
+	else if($(this).text() == "disabled"){
+		$(this).html( "enabled" );
+		$(this).parent().removeClass( "disabled" );
+		$(this).parent().addClass( "enabled" );
+		$.post( "ajax/enableapp.php", { appid: appid }, function(data){ alert(data.status);} );
+	}
+});
\ No newline at end of file
diff --git a/admin/templates/appsinst.php b/admin/templates/appsinst.php
index c1acc09d5d..482273da1d 100644
--- a/admin/templates/appsinst.php
+++ b/admin/templates/appsinst.php
@@ -16,11 +16,11 @@
 	</thead>
 	<tbody>
 		<?php foreach($_["apps"] as $app): ?>
-			<tr>
+			<tr x-uid="<?php echo($app['id']); ?>">
 				<td class="name" width="200"><?php echo($app['name']); ?></td>
 				<td class="version"><?php echo($app['version']); ?></td>
 				<td><?php echo($app['author']); ?></td>
-				<td class="<?php echo $app['enabled'] ? 'enabled' : 'disabled' ?>"><?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?></td>
+				<td class="<?php echo $app['enabled'] ? 'enabled' : 'disabled' ?>"><div x-use="appenableddiv"><?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?></div></td>
 			</tr>
 		<?php endforeach; ?>
 	</tbody>
diff --git a/admin/templates/users.php b/admin/templates/users.php
index c6ee57a61d..0c26fd3bdf 100644
--- a/admin/templates/users.php
+++ b/admin/templates/users.php
@@ -4,7 +4,7 @@
 	<thead>
 		<tr>
 			<th><?php echo $l->t( 'Name' ); ?></th>
-			<th>Groups</th>
+			<th><?php echo $l->t( 'Groups' ); ?></th>
 			<th></th>
 		</tr>
 	</thead>