diff --git a/client/app/settings/pages/accountInfo/accountInfo.coffee b/client/app/settings/pages/accountInfo/accountInfo.coffee
index e5e828ea..88a41224 100644
--- a/client/app/settings/pages/accountInfo/accountInfo.coffee
+++ b/client/app/settings/pages/accountInfo/accountInfo.coffee
@@ -8,9 +8,6 @@ Template['settings_page_accountInfo'].events
 	'submit form': (event) ->
 		event.preventDefault()
 
-		firstName = Helpers.nameCap $('#firstNameInput').val()
-		lastName = Helpers.nameCap $('#lastNameInput').val()
-
 		oldPass = $('#currentPassInput').val()
 
 		mail = $('#mailInput').val().toLowerCase()
@@ -18,11 +15,6 @@ Template['settings_page_accountInfo'].events
 		newPass = $('#newPassInput').val()
 		newPassRepeat = $('#newPassRepeatInput').val()
 
-		nameChanged = (
-			profile = getUserField Meteor.userId(), 'profile'
-			profile.firstName isnt firstName or profile.lastName isnt lastName
-		)
-
 		mailChanged = mail isnt getUserField Meteor.userId(), 'emails[0].address'
 		passChanged = newPass isnt '' or newPassRepeat isnt ''
 		needsPass = mailChanged or passChanged
@@ -61,9 +53,6 @@ Template['settings_page_accountInfo'].events
 				else
 					callback not e?
 
-		if nameChanged
-			Meteor.call 'changeName', firstName, lastName, (e) -> callback not e?
-
 		if passChanged
 			unless newPass is newPassRepeat
 				setFieldError (
diff --git a/client/app/settings/pages/accountInfo/accountInfo.html b/client/app/settings/pages/accountInfo/accountInfo.html
index acc265a4..09d4e958 100644
--- a/client/app/settings/pages/accountInfo/accountInfo.html
+++ b/client/app/settings/pages/accountInfo/accountInfo.html
@@ -1,14 +1,6 @@
 <template name="settings_page_accountInfo">
 	<div id="accountInfoSettings">
 		<form class="vertical full-width">
-			<div id="firstNameGroup" class="group">
-				<label for="firstNameInput">Voornaam</label>
-				<input type="text" id="firstNameInput" placeholder="Henk" value="{{currentUser.profile.firstName}}">
-			</div>
-			<div id="lastNameGroup" class="group">
-				<label for="lastNameInput">Achternaam</label>
-				<input type="text" id="lastNameInput" placeholder="Jansen" value="{{currentUser.profile.lastName}}">
-			</div>
 			<div id="currentPassGroup" class="group">
 				<label for="currentPassInput">Huidig wachtwoord</label>
 				<input type="password" id="currentPassInput" placeholder="●●●●●●●●●●">
diff --git a/client/app/setup/setup.coffee b/client/app/setup/setup.coffee
index 844c47e4..487bb90c 100644
--- a/client/app/setup/setup.coffee
+++ b/client/app/setup/setup.coffee
@@ -7,6 +7,7 @@ SReactiveVar = require('meteor/simply:strict-reactive-var').default
 
 currentSelectedImage      = new SReactiveVar Number, 0
 currentSelectedCourseInfo = new SReactiveVar Number, 0
+currentSelectedName       = new SReactiveVar Number, 0
 
 weekdays = new SReactiveVar [Object]
 
@@ -15,6 +16,10 @@ schoolEngineSub = null
 
 setup = undefined
 
+anyServiceLoggedIn = ->
+	services = externalServices.get()
+	_.some services, (s) -> s.loginNeeded and s.profileData()?
+
 # TODO: These methods are not really DRY, even overall ugly.
 pictures = ->
 	current = currentSelectedImage.get()
@@ -50,10 +55,21 @@ courseInfos = ->
 		.value()
 
 names = ->
-	for service in externalServices.get()
-		val = service.profileData()?.nameInfo
-		return val if val?
-	undefined
+	current = currentSelectedName.get()
+
+	_(externalServices.get())
+		.map (s) -> s.profileData()?.nameInfo
+		.reject _.isEmpty
+		.uniq (info) -> "#{info.firstName} #{info.lastName}"
+		.map (c, i) ->
+			isSelected: ->
+				if current is i
+					'selected'
+				else
+					''
+			value: c
+			index: i
+		.value()
 
 addProgress = (item, cb) ->
 	ga 'send', 'event', 'setup', 'progress', item
@@ -84,32 +100,7 @@ class @Setup
 					.map (s) -> s.profileData()?.schoolId
 					.find _.negate _.isUndefined
 
-				done = (success) ->
-					if success?
-						addProgress 'externalServices', -> cb yes
-					else
-						cb no
-
-				loginServices = _.filter externalServices.get(), 'loginNeeded'
-				data = _.filter loginServices, (s) -> s.profileData()?
-				if loginServices.length > 0 and data.length is 0
-					alertModal(
-						'Hé!'
-						'''
-							Je hebt je op geen enkele site ingelogd!
-							Hierdoor zal simplyHomework niet automagisch data van sites voor je kunnen ophalen.
-							Als je later toch een site wilt toevoegen kan dat altijd in je instellingen.
-
-							Weet je zeker dat je door wilt gaan?
-						'''
-						DialogButtons.OkCancel
-						{ main: 'doorgaan', second: 'woops' }
-						{ main: 'btn-danger' }
-						main: -> done yes
-						second: -> done no
-					)
-				else
-					done yes
+				addProgress 'externalServices', -> cb yes
 		}
 
 		{
@@ -118,11 +109,9 @@ class @Setup
 			onDone: (cb) ->
 				schoolQuery = $('#setup #schoolInput').val()
 
-				$firstNameInput = $ '#setup #firstNameInput'
-				$lastNameInput = $ '#setup #lastNameInput'
 				any = no
-				any = yes if empty($firstNameInput, '#firstNameGroup', 'Voornaam is leeg')
-				any = yes if empty($lastNameInput, '#lastNameGroup', 'Achternaam is leeg')
+
+				name = names()[currentSelectedName.get()]?.value
 
 				courseInfo = courseInfos()[currentSelectedCourseInfo.get()]?.value
 				unless courseInfo?
@@ -159,8 +148,8 @@ class @Setup
 								fetchedBy: val.fetchedBy
 						)
 						'profile.courseInfo': courseInfo
-						'profile.firstName': Helpers.nameCap $firstNameInput.val()
-						'profile.lastName': Helpers.nameCap $lastNameInput.val()
+						'profile.firstName': name.firstName
+						'profile.lastName': name.lastName
 						'profile.birthDate':
 							# Picks the date from the first externalService that has one.
 							# REVIEW: Maybe we should ask the user too?
@@ -340,16 +329,20 @@ Template.setup.onRendered ->
 
 Template.setupFooter.helpers
 	isLast: -> _.every setup?.running, 'done'
+	showButton: ->
+		current = setup?.current()
+		current?.name isnt 'externalServices' or anyServiceLoggedIn()
 
 Template.setupFooter.events
 	'click button': -> setup.finishStep()
 
+# === step template stuff
+
 Template['setup-extractInfo'].helpers
 	pictures: pictures
 	hasSchool: -> schoolId?
 	courseInfos: courseInfos
-	firstName: -> names()?.firstName
-	lastName: -> names()?.lastName
+	names: names
 
 Template['setup-extractInfo'].events
 	'click #pictureSelector > img': (event) ->
@@ -358,6 +351,9 @@ Template['setup-extractInfo'].events
 	'click #courseInfoSelector > div': (event) ->
 		currentSelectedCourseInfo.set @index
 
+	'click #nameSelector > div': (event) ->
+		currentSelectedName.set @index
+
 Template['setup-extractInfo'].onRendered ->
 	unless schoolId?
 		engine = new Bloodhound
diff --git a/client/app/setup/setup.html b/client/app/setup/setup.html
index 1e6dd4a6..a89cdf43 100644
--- a/client/app/setup/setup.html
+++ b/client/app/setup/setup.html
@@ -14,13 +14,17 @@
 
 <template name="setupFooter">
 	<div class="footer">
-		<button class="btn btn-primary">
-			{{#if isLast}}
-				afronden
-			{{else}}
-				verder
-			{{/if}}
-		</button>
+		{{! TODO: back button}}
+
+		{{#if showButton}}
+			<button class="btn btn-primary">
+				{{#if isLast}}
+					afronden
+				{{else}}
+					verder
+				{{/if}}
+			</button>
+		{{/if}}
 	</div>
 </template>
 
@@ -118,17 +122,15 @@ <h2>Profielinfo</h2>
 		<hr>
 
 		<h2>Naam</h2>
-		<form class="vertical full-width">
-			<div id="firstNameGroup" class="group">
-				<label for="firstNameInput">Voornaam</label>
-				<input type="text" id="firstNameInput" value="{{firstName}}"/>
-			</div>
-			<div id="lastNameGroup" class="group">
-				<label for="lastNameInput">Achternaam</label>
-				<input type="text" id="lastNameInput" value="{{lastName}}"/>
+		{{#with names}}
+			<div id="nameSelector" class="selector">
+				{{#each this}}
+					<div class="{{isSelected}}">
+						{{value.firstName}} {{value.lastName}}
+					</div>
+				{{/each}}
 			</div>
-		</form>
-
+		{{/with}}
 	</div>
 </template>
 
diff --git a/lib/methods.coffee b/lib/methods.coffee
index 66c340c3..a47a8e24 100644
--- a/lib/methods.coffee
+++ b/lib/methods.coffee
@@ -117,26 +117,6 @@ Meteor.methods
 			$set: isRead: yes
 		}
 
-	###*
-	# @method changeName
-	# @param {String} firstName non empty string.
-	# @param {String} lastName non empty string.
-	###
-	changeName: (firstName, lastName) ->
-		check firstName, String
-		check lastName, String
-
-		firstName = Helpers.nameCap firstName.trim()
-		lastName = Helpers.nameCap lastName.trim()
-
-		if firstName.length is 0 or lastName.length is 0
-			throw new Meteor.Error 'name-empty'
-
-		Meteor.users.update @userId,
-			$set:
-				'profile.firstName': firstName
-				'profile.lastName': lastName
-
 	###*
 	# @method saveMessageDraft
 	# @param {Draft} draft