Index: trunk/grails-app/controllers/AppCoreController.groovy
===================================================================
--- trunk/grails-app/controllers/AppCoreController.groovy	(revision 290)
+++ trunk/grails-app/controllers/AppCoreController.groovy	(revision 291)
@@ -6,5 +6,5 @@
 class AppCoreController extends BaseController {
 
-    def personService
+    def authService
     def appConfigService
     def createDataService
@@ -22,5 +22,5 @@
     */
     def welcome = {
-        def personInstance = personService.currentUser
+        def personInstance = authService.currentUser
         flash.message = "Welcome, ${personInstance.firstName} ${personInstance.lastName}."
 
@@ -41,9 +41,9 @@
     def changeSessionTimeout = {
         if (request.method == 'GET') {
-            def personInstance = personService.currentUser
+            def personInstance = authService.currentUser
             return [ personInstance : personInstance ]       
         }
         if (request.method == 'POST') {
-            def personInstance = personService.currentUser
+            def personInstance = authService.currentUser
                 personInstance.properties = params
                 if (!personInstance.hasErrors() && personInstance.save(flush: true)) {
@@ -67,10 +67,10 @@
 
         if (request.method == 'GET') {
-            def personInstance = personService.currentUser
+            def personInstance = authService.currentUser
             return [ personInstance : personInstance ]       
         }
 
         if (request.method == 'POST') {
-            def personInstance = personService.currentUser
+            def personInstance = authService.currentUser
 
             if(params.confirmPass == params.pass) {
Index: trunk/grails-app/controllers/EntryDetailedController.groovy
===================================================================
--- trunk/grails-app/controllers/EntryDetailedController.groovy	(revision 290)
+++ trunk/grails-app/controllers/EntryDetailedController.groovy	(revision 291)
@@ -3,5 +3,5 @@
 class EntryDetailedController extends BaseController {
 
-    def personService
+    def authService
     def taskService
 
@@ -29,5 +29,5 @@
         def entryInstance = Entry.get( params.id )
         if(entryInstance) {
-            if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) {
+            if(entryInstance.enteredBy.loginName == authService.currentUser.loginName) {
                 def taskID = entryInstance.task.id
                 entryInstance.delete(flush:true)
@@ -55,5 +55,5 @@
         else {
 
-            if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) {
+            if(entryInstance.enteredBy.loginName == authService.currentUser.loginName) {
                 return [ entryInstance : entryInstance ]
             }
@@ -70,5 +70,5 @@
         if(entryInstance) {
             // The update method only accepts post requests, so this is just in case.
-            if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) {
+            if(entryInstance.enteredBy.loginName == authService.currentUser.loginName) {
                 entryInstance.properties = params
                 if(!entryInstance.hasErrors() && entryInstance.save(flush: true)) {
Index: trunk/grails-app/controllers/TaskDetailedController.groovy
===================================================================
--- trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 290)
+++ trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 291)
@@ -5,5 +5,5 @@
 class TaskDetailedController extends BaseController {
 
-    def personService
+    def authService
     def taskService
     def taskSearchService
@@ -45,5 +45,5 @@
         def taskInstanceTotal
         def filterParams = [:]
-        def personInstance = personService.currentUser
+        def personInstance = authService.currentUser
 
         // Quick Search:
@@ -125,5 +125,5 @@
         if(!FilterUtils.isFilterApplied(params)) {
             def taskInstanceList = []
-            def personInstance = personService.currentUser
+            def personInstance = authService.currentUser
 
             if(params.quickSearch == "searchMyTodays") {
@@ -170,5 +170,5 @@
         if(!FilterUtils.isFilterApplied(params)) {
             def taskInstanceList = []
-            def personInstance = personService.currentUser
+            def personInstance = authService.currentUser
 
             if(params.quickSearch == "budgetUnplanned") {
@@ -501,5 +501,5 @@
 
         // Default leadPerson to current user, unless supplied in params.
-        taskInstance.leadPerson = personService.currentUser
+        taskInstance.leadPerson = authService.currentUser
         taskInstance.properties = params
         return ['taskInstance': taskInstance]