diff --git a/lib/galaxy/jobs/handler.py b/lib/galaxy/jobs/handler.py
index e100a55d2cf..5cf7359df2c 100644
--- a/lib/galaxy/jobs/handler.py
+++ b/lib/galaxy/jobs/handler.py
@@ -186,7 +186,7 @@ class JobHandlerQueue( object ):
         jobs (either from the database or from its own queue), then iterates
         over all new and waiting jobs to check the state of the jobs each
         depends on. If the job has dependencies that have not finished, it
-        it goes to the waiting queue. If the job has dependencies with errors,
+        goes to the waiting queue. If the job has dependencies with errors,
         it is marked as having errors and removed from the queue. If the job
         belongs to an inactive user it is ignored.
         Otherwise, the job is dispatched.
diff --git a/lib/galaxy/webapps/galaxy/api/tools.py b/lib/galaxy/webapps/galaxy/api/tools.py
index f686ced809a..e84b118c231 100644
--- a/lib/galaxy/webapps/galaxy/api/tools.py
+++ b/lib/galaxy/webapps/galaxy/api/tools.py
@@ -218,6 +218,11 @@ class ToolsController( BaseAPIController, UsesVisualizationMixin ):
         tool = trans.app.toolbox.get_tool( payload[ 'tool_id' ] , tool_version ) if 'tool_id' in payload else None
         if not tool or not tool.allow_user_access( trans.user ):
             raise exceptions.MessageException( 'Tool not found or not accessible.' )
+        if trans.app.config.user_activation_on:
+            if not trans.user:
+                log.warning( "Anonymous user attempts to execute tool, but account activation is turned on." )
+            elif not trans.user.active:
+                log.warning( "User \"%s\" attempts to execute tool, but account activation is turned on and user account is not active." % trans.user.email )
 
         # Set running history from payload parameters.
         # History not set correctly as part of this API call for