diff --git a/SoObjects/Mailer/SOGoMailBaseObject.m b/SoObjects/Mailer/SOGoMailBaseObject.m
index 11b74259b..e6c2260d4 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.m
+++ b/SoObjects/Mailer/SOGoMailBaseObject.m
@@ -20,7 +20,6 @@
 */
 
 #import <NGObjWeb/SoObject+SoDAV.h>
-#import <NGObjWeb/SoHTTPAuthenticator.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index 0b3e7ef24..f8a602b73 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -43,7 +43,8 @@ libSOGo_HEADER_FILES = \
 	NSDictionary+URL.h		\
 	NSCalendarDate+SOGo.h		\
 	\
-	SOGoAuthenticator.h		\
+	SOGoDAVAuthenticator.h		\
+	SOGoWebAuthenticator.h		\
 	SOGoMailer.h			\
 	SOGoUser.h			\
 
@@ -71,7 +72,8 @@ libSOGo_OBJC_FILES = \
 	NSNull+Utilities.m		\
 	NSCalendarDate+SOGo.m		\
 	\
-	SOGoAuthenticator.m		\
+	SOGoDAVAuthenticator.m		\
+	SOGoWebAuthenticator.m		\
 	SOGoMailer.m			\
 	SOGoUser.m			\
 
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 8d84e9289..280211e53 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -46,7 +46,7 @@
 
 #import "SOGoPermissions.h"
 #import "SOGoUser.h"
-#import "SOGoAuthenticator.h"
+#import "SOGoDAVAuthenticator.h"
 #import "SOGoUserFolder.h"
 
 #import "SOGoDAVRendererTypes.h"
@@ -268,13 +268,13 @@ static BOOL kontactGroupDAV = YES;
 
 - (SOGoDAVSet *) davCurrentUserPrivilegeSet
 {
-  SOGoAuthenticator *sAuth;
+  SOGoDAVAuthenticator *sAuth;
   SoUser *user;
   NSArray *roles;
   SoClassSecurityInfo *sInfo;
   NSArray *davPermissions;
 
-  sAuth = [SOGoAuthenticator sharedSOGoAuthenticator];
+  sAuth = [SOGoDAVAuthenticator sharedSOGoDAVAuthenticator];
   user = [sAuth userInContext: context];
   roles = [user rolesForObject: self inContext: context];
   sInfo = [[self class] soClassSecurityInfo];
diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index 2b5cca182..01801d0f0 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -28,7 +28,7 @@
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 
-#import <SoObjects/SOGo/SOGoAuthenticator.h>
+#import <SoObjects/SOGo/SOGoWebAuthenticator.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 
 #import "SOGoRootPage.h"
@@ -59,7 +59,7 @@
 {
   WOResponse *r;
   NSString *login, *rhk;
-  SOGoAuthenticator *auth;
+  SOGoWebAuthenticator *auth;
   SOGoUser *user;
   SOGoUserFolder *home;
   WOApplication *base;
@@ -72,7 +72,7 @@
   auth = [[self clientObject] authenticatorInContext: context];
   user = [auth userInContext: context];
   login = [user login];
-  
+
   if ([login isEqualToString:@"anonymous"]) {
     /* use root page for unauthenticated users */
     return self;
diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index 7859b90d6..572ee1aa8 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -33,7 +33,7 @@
 #import <NGExtensions/NSObject+Logs.h>
 
 #import <Appointments/SOGoFreeBusyObject.h>
-#import <SoObjects/SOGo/SOGoAuthenticator.h>
+#import <SoObjects/SOGo/SOGoWebAuthenticator.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
 #import <SOGoUI/UIxComponent.h>
@@ -205,7 +205,7 @@ static NSString *defaultModule = nil;
   WOResponse *response;
   NSEnumerator *cookies;
   WOCookie *cookie;
-  SOGoAuthenticator *auth;
+  SOGoWebAuthenticator *auth;
   id container;
 
   container = [[self clientObject] container];