diff --git a/source/java/org/alfresco/rest/api/impl/AuditImpl.java b/source/java/org/alfresco/rest/api/impl/AuditImpl.java
index 33717fda50..a9431015fe 100644
--- a/source/java/org/alfresco/rest/api/impl/AuditImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/AuditImpl.java
@@ -381,11 +381,11 @@ public class AuditImpl implements Audit
         // Enable/Disable audit application
         if (auditApp.getIsEnabled() && !auditApplication.isEnabled())
         {
-            auditService.enableAudit(auditApplication.getName(), auditApplication.getKey());
+            auditService.enableAudit(auditApplication.getName(), null);
         }
         else if (!auditApp.getIsEnabled() && auditApplication.isEnabled())
         {
-            auditService.disableAudit(auditApplication.getName(), auditApplication.getKey());
+            auditService.disableAudit(auditApplication.getName(), null);
         }
 
         return new AuditApp(auditApplication.getKey().substring(1), auditApplication.getName(), auditApp.getIsEnabled());
diff --git a/source/test-java/org/alfresco/rest/api/tests/AuditAppTest.java b/source/test-java/org/alfresco/rest/api/tests/AuditAppTest.java
index 9cb225a3db..542a9192f3 100644
--- a/source/test-java/org/alfresco/rest/api/tests/AuditAppTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/AuditAppTest.java
@@ -249,9 +249,10 @@ public class AuditAppTest extends AbstractSingleNetworkSiteTest
 
         setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
 
-        //Get one of the audit app ids (default tagging)
+        //Get one of the audit app ids ( fail test if there are no audit apps in the system )
         ListResponse<AuditApp> apps = publicApiClient.auditApps().getAuditApps(null, "Getting audit apps error ", HttpServletResponse.SC_OK);
-        appId = (apps.getList().size()>0) ? apps.getList().get(0).getId() : "tagging";
+        if (apps.getList().size() == 0) fail("There are no audit applications to run this test against.");
+        appId = apps.getList().get(0).getId();
 
         // +ve
         // Disable audit app
@@ -281,7 +282,7 @@ public class AuditAppTest extends AbstractSingleNetworkSiteTest
         // 501
         AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
         disableSystemAudit();
-        responseAuditApp = publicApiClient.auditApps().updateAuditApp(appId,requestAuditApp,null, HttpServletResponse.SC_NOT_IMPLEMENTED);
+        publicApiClient.auditApps().updateAuditApp(appId,requestAuditApp,null, HttpServletResponse.SC_NOT_IMPLEMENTED);
         enableSystemAudit();
     }
 
diff --git a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java
index 347ef36b13..a911e43f18 100644
--- a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java
+++ b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java
@@ -2480,7 +2480,7 @@ public class PublicApiClient
 
         public AuditApp updateAuditApp(String applicationId, AuditApp auditApp, Map<String, String> params,  int expectedStatus) throws PublicApiException
         {
-            HttpResponse response = update("audit-applications", applicationId,null,null, auditApp.toJSON().toString(), params, "Eriks test failed", expectedStatus);
+            HttpResponse response = update("audit-applications", applicationId,null,null, auditApp.toJSON().toString(), params, "Failed to update Audit Application", expectedStatus);
 
             if (response != null && response.getJsonResponse() != null)
             {
@@ -2490,7 +2490,6 @@ public class PublicApiClient
                     return AuditApp.parseAuditApp(jsonEntry);
                 }
             }
-
             return null;
         }