diff --git a/src/controllers/EventController.ts b/src/controllers/EventController.ts
index 898f0d24..a614ce3e 100644
--- a/src/controllers/EventController.ts
+++ b/src/controllers/EventController.ts
@@ -5,21 +5,24 @@ import { ResponseSchema } from 'routing-controllers-openapi';
 import { Event, Attendance } from '@Entities';
 import { EventRequest, EventResponse, MultipleEventResponse, EventSignInRequest } from '@Payloads';
 import { AppUserService, EventService } from '@Services';
-import { EventMapper } from '@Mappers';
+import { AppUserMapper, EventMapper } from '@Mappers';
 
 @singleton()
 @JsonController('/api/events')
 export class EventController {
   private appUserService: AppUserService;
+  private appUserMapper: AppUserMapper;
   private eventService: EventService;
   private eventMapper: EventMapper;
 
   constructor(
     @inject(AppUserService) appUserService: AppUserService,
+    @inject(AppUserMapper) appUserMapper: AppUserMapper,
     @inject(EventService) eventService: EventService,
     @inject(EventMapper) eventMapper: EventMapper
   ) {
     this.appUserService = appUserService;
+    this.appUserMapper = appUserMapper;
     this.eventService = eventService;
     this.eventMapper = eventMapper;
   }
@@ -85,10 +88,20 @@ export class EventController {
   async signInToEvent(
     @Param('eventID') eventID: number,
     @Body() appUserRequest: EventSignInRequest
-  ): Promise<Attendance> {
-    const savedAppUser = await this.appUserService.saveNonAffiliate(appUserRequest);
+  ): Promise<Attendance | undefined> {
+    const { email } = appUserRequest;
+    const appUserFromEmail = await this.appUserService.getAppUserByEmail(email);
+    const appUserToSave = await this.appUserMapper.requestToEntityByEmail(
+      appUserFromEmail,
+      appUserRequest
+    );
+
+    if (appUserToSave === undefined) {
+      return undefined;
+    }
+
+    const savedAppUser = await this.appUserService.saveNonAffiliate(appUserToSave);
 
-    // savedAppUser is undefined if AppUser from appUserRequest is an affiliate
     if (savedAppUser === undefined) {
       /*
        * TODO: Handle the case where user is an affiliate
diff --git a/src/mappers/AppUserMapper.ts b/src/mappers/AppUserMapper.ts
index 82214e54..c503d3b1 100644
--- a/src/mappers/AppUserMapper.ts
+++ b/src/mappers/AppUserMapper.ts
@@ -46,6 +46,19 @@ export class AppUserMapper {
     return appUser;
   }
 
+  async requestToEntityByEmail(
+    appUserFromEmail: AppUser,
+    appUserRequest: EventSignInRequest
+  ): Promise<AppUser | undefined> {
+    if (appUserFromEmail === undefined) {
+      return this.requestToNewEntity(appUserRequest);
+    } else {
+      const { id } = appUserFromEmail;
+
+      return await this.requestToExistingEntity(appUserRequest, id);
+    }
+  }
+
   /**
    * Converts an AppUser entity to an EventSignInResponse payload and returns the
    * newly created response payload to the caller.
diff --git a/src/services/AppUserService.ts b/src/services/AppUserService.ts
index 01019a34..a30a235f 100644
--- a/src/services/AppUserService.ts
+++ b/src/services/AppUserService.ts
@@ -1,17 +1,13 @@
 import { AppUser, AppUserRole } from '@Entities';
-import { AppUserMapper } from '@Mappers';
-import { EventSignInRequest } from '@Payloads';
 import { singleton, inject } from 'tsyringe';
 import { Any, Repository, getRepository } from 'typeorm';
 
 @singleton()
 export class AppUserService {
   private appUserRepository: Repository<AppUser>;
-  private appUserMapper: AppUserMapper;
 
-  constructor(@inject(AppUserMapper) appUserMapper: AppUserMapper) {
+  constructor() {
     this.appUserRepository = getRepository(AppUser);
-    this.appUserMapper = appUserMapper;
   }
 
   /**
@@ -39,27 +35,17 @@ export class AppUserService {
    * @param email The email used to look for the corresponding AppUser.
    *
    */
-  getAppUserByEmail(email: string): Promise<AppUser> {
+  getAppUserByEmail(email: string): Promise<AppUser | undefined> {
     return this.appUserRepository.findOne({ email });
   }
 
-  async saveNonAffiliate(appUserRequest: EventSignInRequest): Promise<AppUser | undefined> {
-    const { email } = appUserRequest;
-    const appUserFromEmail = await this.getAppUserByEmail(email);
-    let currAppUser = null;
+  async saveNonAffiliate(appUser: AppUser): Promise<AppUser | undefined> {
+    const { role } = appUser;
 
-    if (appUserFromEmail === undefined) {
-      currAppUser = this.appUserMapper.requestToNewEntity(appUserRequest);
-    } else {
-      const { id, role } = appUserFromEmail;
-
-      if (role === AppUserRole.GUEST) {
-        currAppUser = await this.appUserMapper.requestToExistingEntity(appUserRequest, id);
-      } else {
-        return undefined;
-      }
+    if (role !== undefined && role !== AppUserRole.GUEST) {
+      return undefined;
     }
 
-    return await this.saveAppUser(currAppUser);
+    return await this.saveAppUser(appUser);
   }
 }
diff --git a/src/services/AttendanceService.ts b/src/services/AttendanceService.ts
index f3ae2aa3..6c6a632b 100644
--- a/src/services/AttendanceService.ts
+++ b/src/services/AttendanceService.ts
@@ -25,10 +25,4 @@ export class AttendanceService {
 
     return newAttendance;
   }
-
-  async getAttendanceByEventUser(event: Event, attendee: AppUser): Promise<Attendance | undefined> {
-    const attendanceToCheck = await this.attendanceRepository.findOne({ event, attendee });
-
-    return attendanceToCheck;
-  }
 }