diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/app/EMailVerificationServlet.java b/phoneblock/src/main/java/de/haumacher/phoneblock/app/EMailVerificationServlet.java
index 165122e3..7cacef07 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/app/EMailVerificationServlet.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/app/EMailVerificationServlet.java
@@ -18,16 +18,27 @@
 import de.haumacher.phoneblock.db.DBService;
 import de.haumacher.phoneblock.mail.MailService;
 import de.haumacher.phoneblock.mail.MailServiceStarter;
+import de.haumacher.phoneblock.util.ServletUtil;
 
 /**
- * {@link HttpServlet} that is invoked from the <code>signup.jsp</code> form.
+ * {@link HttpServlet} that is invoked from the <code>login.jsp</code> form when requesting to login by e-mail.
  */
 @WebServlet(urlPatterns = {
-	EMailVerificationServlet.VERIFY_WEB,
+	EMailVerificationServlet.LOGIN_WEB,
 })
 public class EMailVerificationServlet extends HttpServlet {
 
-	public static final String VERIFY_WEB = "/verify-web";
+	/**
+	 * Request attribute holding the page to re-start login/signup.
+	 */
+	public static final String RESTART_PAGE_ATTR = "restartPage";
+
+	/**
+	 * Request attribute set, if e-mail verification failed.
+	 */
+	public static final String VERIFY_ERROR_ATTR = "message";
+	
+	public static final String LOGIN_WEB = "/login-web";
 	
 	private static final Logger LOG = LoggerFactory.getLogger(EMailVerificationServlet.class);
 
@@ -66,26 +77,30 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 		req.getSession().setAttribute("email", email);
 		req.getSession().setAttribute("code", code);
 		req.setAttribute("email", email);
+		req.setAttribute(RESTART_PAGE_ATTR, failurePage(req));
 		req.getRequestDispatcher(successPage(req)).forward(req, resp);
 	}
 
 	private void sendFailure(HttpServletRequest req, HttpServletResponse resp, String message)
 			throws ServletException, IOException {
-		req.setAttribute("message", message);
+		req.setAttribute(VERIFY_ERROR_ATTR, message);
 		req.getRequestDispatcher(failurePage(req)).forward(req, resp);
 	}
 
-	private String failurePage(HttpServletRequest req) {
+	/**
+	 * The page to redirect, if something went wrong.
+	 */
+	private static String failurePage(HttpServletRequest req) {
 		switch (req.getServletPath()) {
-		case VERIFY_WEB: 
+		case LOGIN_WEB: 
 		default:
-			return "/signup.jsp";
+			return "/login.jsp";
 		}
 	}
 
 	private String successPage(HttpServletRequest req) {
 		switch (req.getServletPath()) {
-			case VERIFY_WEB: 
+			case LOGIN_WEB: 
 			default:
 				return "/signup-code.jsp"; 
 		}
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/app/LoginServlet.java b/phoneblock/src/main/java/de/haumacher/phoneblock/app/LoginServlet.java
index 74afa0a5..87e2d16b 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/app/LoginServlet.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/app/LoginServlet.java
@@ -27,6 +27,11 @@
 @WebServlet(urlPatterns = LoginServlet.PATH)
 public class LoginServlet extends HttpServlet {
 	
+	/**
+	 * Request attribute set, if a login was not successful.
+	 */
+	public static final String LOGIN_ERROR_ATTR = "loginError";
+
 	public static final String USER_NAME_PARAM = "userName";
 
 	public static final String PASSWORD_PARAM = "password";
@@ -96,6 +101,13 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 		
 		LoginFilter.setAuthenticatedUser(req, authenticatedUser);
 		
+		redirectToLocationAfterLogin(req, resp);
+	}
+
+	/**
+	 * Redirects the current request to its final destination.
+	 */
+	public static void redirectToLocationAfterLogin(HttpServletRequest req, HttpServletResponse resp) throws IOException {
 		String location = location(req);
 		if (location == null) {
 			resp.sendRedirect(req.getContextPath() + SettingsServlet.PATH);
@@ -120,7 +132,7 @@ public static void processRememberMe(HttpServletRequest req, HttpServletResponse
 	 * Redirects the client to the login page.
 	 */
 	public static void sendFailure(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		req.setAttribute("error", "Anmeldung fehlgeschlagen.");
+		req.setAttribute(LOGIN_ERROR_ATTR, "Anmeldung fehlgeschlagen.");
 		req.getRequestDispatcher("/login.jsp").forward(req, resp);
 	}
 
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/app/RegistrationServlet.java b/phoneblock/src/main/java/de/haumacher/phoneblock/app/RegistrationServlet.java
index 7b1382b8..33adb7ae 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/app/RegistrationServlet.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/app/RegistrationServlet.java
@@ -27,15 +27,15 @@
 })
 public class RegistrationServlet extends HttpServlet {
 
+	/**
+	 * Request attribute set, if registration fails.
+	 */
+	public static final String REGISTER_ERROR_ATTR = "message";
+
 	public static final String REGISTER_WEB = "/register-web";
 
 	private static final String PASSWORD_ATTR = "passwd";
 
-	/**
-	 * The authorization scope "email".
-	 */
-	public static final String IDENTIFIED_BY_EMAIL = "email";
-	
 	private static final Logger LOG = LoggerFactory.getLogger(RegistrationServlet.class);
 
 	@Override
@@ -57,26 +57,33 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 		String email = (String) req.getSession().getAttribute("email");
 		
 		String login;
-		String passwd;
 		try {
+			String passwd;
+			
 			DB db = DBService.getInstance();
-			String extId = email.trim().toLowerCase();
-			login = db.getLogin(RegistrationServlet.IDENTIFIED_BY_EMAIL, extId);
+			login = db.getEmailLogin(email);
 			if (login == null) {
 				login = UUID.randomUUID().toString();
-				passwd = db.createUser(IDENTIFIED_BY_EMAIL, extId, login, email);
+				
+				String displayName = DB.toDisplayName(email);
+				
+				passwd = db.createUser(login, displayName);
 				db.setEmail(login, email);
 			} else {
-				passwd = db.resetPassword(login);
+				// No longer known.
+				passwd = null;
 			}
+			
+			String rememberValue = req.getParameter(LoginServlet.REMEMBER_PARAM);
+			LoginServlet.processRememberMe(req, resp, db, rememberValue, login);
+
+			startSetup(req, resp, login, passwd);
 		} catch (Exception ex) {
 			LOG.error("Failed to create user: " + email, ex);
 
 			sendError(req, resp, "Bei der Erstellung des Accounts ist ein Fehler aufgetreten: " + ex.getMessage());
 			return;
 		}
-		
-		startSetup(req, resp, login, passwd);
 	}
 
 	/** 
@@ -85,13 +92,20 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 	public static void startSetup(HttpServletRequest req, HttpServletResponse resp,
 			String login, String passwd) throws ServletException, IOException {
 		LoginFilter.setAuthenticatedUser(req, login);
-		req.getSession().setAttribute(PASSWORD_ATTR, passwd);
+		if (passwd != null) {
+			req.getSession().setAttribute(PASSWORD_ATTR, passwd);
+		}
 		
 		String location = LoginServlet.location(req);
 		if (location != null) {
 			resp.sendRedirect(req.getContextPath() + location);
 		} else {
-			resp.sendRedirect(req.getContextPath() + successPage(req));
+			if (passwd == null) {
+				// Was already registered, no automatic password-reset.
+				resp.sendRedirect(req.getContextPath() + SettingsServlet.PATH);
+			} else {
+				resp.sendRedirect(req.getContextPath() + successPage(req));
+			}
 		}
 	}
 
@@ -104,7 +118,7 @@ private static String successPage(HttpServletRequest req) {
 	}
 	
 	private void sendError(HttpServletRequest req, HttpServletResponse resp, String message) throws ServletException, IOException {
-		req.setAttribute("message", message);
+		req.setAttribute(REGISTER_ERROR_ATTR, message);
 		req.getRequestDispatcher(errorPage(req)).forward(req, resp);
 	}
 
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/app/ResetPasswordServlet.java b/phoneblock/src/main/java/de/haumacher/phoneblock/app/ResetPasswordServlet.java
index 4b9afe41..da74c3d7 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/app/ResetPasswordServlet.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/app/ResetPasswordServlet.java
@@ -40,7 +40,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 		String password = DBService.getInstance().resetPassword(login);
 		if (password == null) {
 			req.setAttribute("message", "Nutzername nicht gefunden, bitte versuch Dich neu zu registrieren.");
-			req.getRequestDispatcher("/signup.jsp").forward(req, resp);
+			req.getRequestDispatcher("/login.jsp").forward(req, resp);
 			return;
 		}
 		
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/app/api/VerificationServlet.java b/phoneblock/src/main/java/de/haumacher/phoneblock/app/api/VerificationServlet.java
index 03d9eb96..bb85dc37 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/app/api/VerificationServlet.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/app/api/VerificationServlet.java
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.util.UUID;
 
+import jakarta.mail.internet.AddressException;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
@@ -45,17 +46,22 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 		DB db = DBService.getInstance();
 		String email = sessionInfo.getEmail();
 		
-		String extId = email.trim().toLowerCase();
-		String login = db.getLogin(RegistrationServlet.IDENTIFIED_BY_EMAIL, extId);
+		String login;
 		String password;
-		if (login == null) {
-			login = UUID.randomUUID().toString();
-			password = db.createUser(RegistrationServlet.IDENTIFIED_BY_EMAIL, extId, login, email);
-		} else {
-			password = db.resetPassword(login);
+		try {
+			login = db.getEmailLogin(email);
+			if (login == null) {
+				login = UUID.randomUUID().toString();
+				password = db.createUser(login, email);
+				db.setEmail(login, email);
+			} else {
+				password = db.resetPassword(login);
+			}
+		} catch (AddressException e) {
+			ServletUtil.sendError(resp, "Invalid e-mail address.");
+			return;
 		}
 		
-		db.setEmail(login, email);
 		
 		ServletUtil.sendResult(req, resp, RegistrationResult.create().setSession(sessionInfo.getSession()).setLogin(login).setPassword(password));
 	}
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/app/oauth/OAuthLoginServlet.java b/phoneblock/src/main/java/de/haumacher/phoneblock/app/oauth/OAuthLoginServlet.java
index a7463944..347e77e2 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/app/oauth/OAuthLoginServlet.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/app/oauth/OAuthLoginServlet.java
@@ -7,6 +7,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
+import jakarta.mail.internet.AddressException;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
@@ -76,13 +77,31 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 			displayName = null;
 		}
 		
-		String extId = userProfile.getId();
+		String googleId = userProfile.getId();
 		
 		Optional<Object> location = sessionStore.get(context, LoginServlet.LOCATION_ATTRIBUTE);
 		
 		DB db = DBService.getInstance();
-		String login = db.getLogin(clientName, extId);
+		String login = db.getGoogleLogin(googleId);
 		if (login == null) {
+			if (email != null && !email.isBlank()) {
+				try {
+					login = db.getEmailLogin(email);
+					if (login != null) {
+						// Link accounts.
+						db.setGoogleId(login, googleId, displayName);
+					}
+				} catch (AddressException e) {
+					LOG.warn("Reveived invalid e-mail address during Google login of {} login: {}", googleId, email);
+					
+					// Do not try again, see below.
+					email = null;
+				}
+			}
+		}
+		
+		if (login == null) {
+			// Create new account.
 			login = UUID.randomUUID().toString();
 			
 			if (displayName == null) {
@@ -93,10 +112,14 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 				}
 			}
 			
-			String passwd = db.createUser(clientName, extId, login, displayName);
-			db.setExtId(login, extId);
+			String passwd = db.createUser(login, displayName);
+			db.setGoogleId(login, googleId, null);
 			if (email != null) {
-				db.setEmail(login, email);
+				try {
+					db.setEmail(login, email);
+				} catch (AddressException e) {
+					LOG.warn("Reveived invalid e-mail address during Google login of {} login: {}", googleId, email);
+				}
 			}
 			
 			if (location.isEmpty()) {
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/carddav/resource/AddressBookCache.java b/phoneblock/src/main/java/de/haumacher/phoneblock/carddav/resource/AddressBookCache.java
index a2c14f47..712c14ab 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/carddav/resource/AddressBookCache.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/carddav/resource/AddressBookCache.java
@@ -79,7 +79,7 @@ public AddressBookResource lookupAddressBook(String rootUrl, String serverRoot,
 
 		try (SqlSession session = DBService.getInstance().openSession()) {
 			Users users = session.getMapper(Users.class);
-			UserSettings settings = users.getSettings(principal);
+			UserSettings settings = users.getSettingsRaw(principal);
 			
 			int minVotes = settings.getMinVotes();
 			int maxLength = settings.getMaxLength();
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/db/DB.java b/phoneblock/src/main/java/de/haumacher/phoneblock/db/DB.java
index 5615c74b..8a8e1ca9 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/db/DB.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/db/DB.java
@@ -70,6 +70,8 @@
 import de.haumacher.phoneblock.mail.MailService;
 import de.haumacher.phoneblock.mail.check.db.Domains;
 import de.haumacher.phoneblock.scheduler.SchedulerService;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
 
 /**
  * The database abstraction layer.
@@ -263,7 +265,7 @@ else if (!tableNames.contains("NUMBERS")) {
 		        
 		        Map<String, Integer> searchesToday = new HashMap<>();
 		        try (PreparedStatement stmt = connection.prepareStatement("""
-			        	SELECT s.PHONE, s.TODAY FROM SEARCHES s WHERE s.TODAY > 0
+			        	SELECT s.PHONE, s.COUNT - s.BACKUP FROM SEARCHES s WHERE s.COUNT - s.BACKUP > 0
 	        		""")) {
 		        	try (ResultSet result = stmt.executeQuery()) {
 		        		while (result.next()) {
@@ -438,13 +440,13 @@ public String generateVerificationCode() {
 	/**
 	 * Creates a new PhoneBlock user account.
 	 * @param clientName The authorization scope for the new user.
-	 * @param extId The ID in the given authorization scope.
+	 * @param googleId The ID for Google authentication.
 	 * @param login The user name (e.g. e-mail address) of the new account.
 	 * @return The randomly generated password for the account.
 	 */
-	public String createUser(String clientName, String extId, String login, String displayName) {
+	public String createUser(String login, String displayName) {
 		String passwd = createPassword(20);
-		addUser(clientName, extId, login, displayName, passwd);
+		addUser(login, displayName, passwd);
 		return passwd;
 	}
 
@@ -653,21 +655,25 @@ public String createId(int length) {
 	/** 
 	 * Sets the user's e-mail address.
 	 */
-	public void setEmail(String login, String email) {
+	public void setEmail(String login, String email) throws AddressException {
 		try (SqlSession session = openSession()) {
 			Users users = session.getMapper(Users.class);
-			users.setEmail(login, email);
+			users.setEmail(login, canonicalEMail(email));
 			session.commit();
 		}
 	}
 	
 	/** 
 	 * Sets the user's external ID in its OAuth authorization scope.
+	 * @param displayName 
 	 */
-	public void setExtId(String login, String extId) {
+	public void setGoogleId(String login, String googleId, String displayName) {
 		try (SqlSession session = openSession()) {
 			Users users = session.getMapper(Users.class);
-			users.setExtId(login, extId);
+			users.setGoogleId(login, googleId);
+			if (displayName != null && !displayName.isBlank()) {
+				users.setDisplayName(login, displayName);
+			}
 			session.commit();
 		}
 	}
@@ -1118,14 +1124,63 @@ public static Rating rating(NumberInfo n) {
 	}
 
 	private int getMinVotes(SqlSession session, String login) {
-		int minVotes = (login == null) ? MIN_VOTES : getSettings(session, login).getMinVotes();
+		int minVotes = (login == null) ? MIN_VOTES : getUserSettingsRaw(session, login).getMinVotes();
 		return minVotes;
 	}
 
-	private DBUserSettings getSettings(SqlSession session, String login) {
+	private DBUserSettings getUserSettingsRaw(SqlSession session, String login) {
 		Users users = session.getMapper(Users.class);
-		DBUserSettings settings = users.getSettings(login);
-		return settings;
+		return users.getSettingsRaw(login);
+	}
+
+	private DBUserSettings getUserSettings(Users users, String login) {
+		DBUserSettings result = users.getSettingsRaw(login);
+
+		// For legacy compatibility (e-mail addresses as display name).
+		result.setDisplayName(DB.toDisplayName(result.getDisplayName()));
+		
+		return result;
+	}
+
+	/**
+	 * Guesses a display name from an e-mail address.
+	 */
+	public static String toDisplayName(String email) {
+		int atIndex = email.indexOf('@');
+		if (atIndex > 0) {
+			email = email.substring(0, atIndex);
+		}
+		
+		StringBuilder result = new StringBuilder();
+		boolean first = true;
+		for (String part : email.replace('.', ' ').replace('_', ' ').split("\\s+")) {
+			if (part.length() == 0) {
+				continue;
+			}
+			
+			if (first) {
+				first = false;
+			} else {
+				result.append(' ');
+			}
+			
+			boolean firstPart = true;
+			for (String subPart : part.split("-")) {
+				if (subPart.length() == 0) {
+					continue;
+				}
+		
+				if (firstPart) {
+					firstPart = false;
+				} else {
+					result.append('-');
+				}
+				result.append(Character.toUpperCase(subPart.charAt(0)));
+				result.append(subPart.substring(1));
+			}
+		}
+		
+		return result.toString();
 	}
 	
 	/**
@@ -1311,10 +1366,10 @@ public void shutdown() {
 	/** 
 	 * Adds the given user with the given password.
 	 */
-	public void addUser(String clientName, String extId, String login, String displayName, String passwd) {
+	public void addUser(String login, String displayName, String passwd) {
 		try (SqlSession session = openSession()) {
 			Users users = session.getMapper(Users.class);
-			users.addUser(login, clientName, extId, displayName, pwhash(passwd), System.currentTimeMillis());
+			users.addUser(login, displayName, pwhash(passwd), System.currentTimeMillis());
 			session.commit();
 		}
 	}
@@ -1341,16 +1396,36 @@ public String resetPassword(String login) {
 	}
 	
 	/** 
-	 * The user ID, or <code>null</code>, if the user with the given login does not yet exist.
+	 * The local user ID, or <code>null</code>, if the user with the given login does not yet exist.
+	 * 
+	 * @param googleId the user's ID in the Google OpenID provider.
+	 */
+	public String getGoogleLogin(String googleId) {
+		try (SqlSession session = openSession()) {
+			Users users = session.getMapper(Users.class);
+			
+			return users.getGoogleLogin(googleId);
+		}
+	}
+
+	/** 
+	 * The local user ID, or <code>null</code>, if the user with the given login does not yet exist.
+	 * 
+	 * @param email the user's e-mail address.
 	 */
-	public String getLogin(String clientName, String extId) {
+	public String getEmailLogin(String email) throws AddressException {
 		try (SqlSession session = openSession()) {
 			Users users = session.getMapper(Users.class);
 			
-			return users.getLogin(clientName, extId);
+			return users.getEmailLogin(canonicalEMail(email));
 		}
 	}
 
+	private String canonicalEMail(String email) throws AddressException {
+		InternetAddress address = new InternetAddress(email);
+		return address.getAddress().strip().toLowerCase();
+	}
+	
 	/** 
 	 * Sets the last access time for the given user to the given timestamp.
 	 * 
@@ -1368,7 +1443,7 @@ public void updateLastAccess(String login, long timestamp, String userAgent) {
 				// This was the first access, send welcome message;
 				MailService mailService = _mailService;
 				if (mailService != null) {
-					DBUserSettings userSettings = users.getSettings(login);
+					DBUserSettings userSettings = getUserSettings(users, login);
 					users.markWelcome(userSettings.getId());
 					session.commit();
 					
@@ -1387,7 +1462,7 @@ public UserSettings getSettings(String login) {
 		try (SqlSession session = openSession()) {
 			Users users = session.getMapper(Users.class);
 			
-			return users.getSettings(login);
+			return getUserSettings(users, login);
 		}
 	}
 	
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/db/Users.java b/phoneblock/src/main/java/de/haumacher/phoneblock/db/Users.java
index 96a6986f..e705f7dc 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/db/Users.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/db/Users.java
@@ -12,7 +12,6 @@
 import org.apache.ibatis.annotations.Update;
 
 import de.haumacher.phoneblock.ab.DBAnswerbotInfo;
-import de.haumacher.phoneblock.ab.proto.AnswerbotInfo;
 import de.haumacher.phoneblock.db.settings.AuthToken;
 
 /**
@@ -20,9 +19,9 @@
  */
 public interface Users {
 
-	@Insert("insert into USERS (LOGIN, CLIENTNAME, EXTID, DISPLAYNAME, PWHASH, REGISTERED, MIN_VOTES, MAX_LENGTH) " + 
-			"values (#{login}, #{clientName}, #{extId}, #{displayName}, #{pwhash}, #{registered}, 4, 2000)")
-	void addUser(String login, String clientName, String extId, String displayName, byte[] pwhash, long registered);
+	@Insert("insert into USERS (LOGIN, DISPLAYNAME, PWHASH, REGISTERED, MIN_VOTES, MAX_LENGTH) " + 
+			"values (#{login}, #{displayName}, #{pwhash}, #{registered}, 4, 2000)")
+	void addUser(String login, String displayName, byte[] pwhash, long registered);
 	
 	@Update("update USERS set PWHASH=#{pwhash} where ID=#{userId}")
 	void setPassword(long userId, byte[] pwhash);
@@ -30,8 +29,11 @@ public interface Users {
 	@Update("update USERS set EMAIL=#{email} where LOGIN=#{login}")
 	void setEmail(String login, String email);
 	
-	@Update("update USERS set EXTID=#{extId} where LOGIN=#{login}")
-	void setExtId(String login, String extId);
+	@Update("update USERS set GOOGLEID=#{googleId} where LOGIN=#{login}")
+	void setGoogleId(String login, String googleId);
+	
+	@Update("update USERS set DISPLAYNAME=#{displayName} where LOGIN=#{login}")
+	void setDisplayName(String login,  String displayName);
 	
 	@Delete("delete from USERS where LOGIN=#{login}")
 	void deleteUser(String login);
@@ -131,13 +133,19 @@ insert into TOKENS (
 	Long getUserId(String login);
 	
 	/** 
-	 * Retrieves the user ID for the user with the given user name (e-mail).
+	 * Retrieves the user ID for the user with the given Google ID.
+	 */
+	@Select("select LOGIN from USERS where GOOGLEID=#{googleId}")
+	String getGoogleLogin(String googleId);
+	
+	/** 
+	 * Retrieves the user ID for the user with the given e-mail.
 	 */
-	@Select("select LOGIN from USERS where CLIENTNAME=#{clientName} and EXTID=#{extId}")
-	String getLogin(String clientName, String extId);
+	@Select("select LOGIN from USERS where EMAIL=#{email}")
+	String getEmailLogin(String email);
 
 	@Select("select ID, LOGIN, DISPLAYNAME, EMAIL, MIN_VOTES, MAX_LENGTH, WILDCARDS, LASTACCESS from USERS where LOGIN=#{login}")
-	DBUserSettings getSettings(String login);
+	DBUserSettings getSettingsRaw(String login);
 	
 	@Select("select LOGIN from USERS where ID=#{userId}")
 	String getUserName(long userId);
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/db/db-migration-03.sql b/phoneblock/src/main/java/de/haumacher/phoneblock/db/db-migration-03.sql
new file mode 100644
index 00000000..67f7f432
--- /dev/null
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/db/db-migration-03.sql
@@ -0,0 +1,8 @@
+ALTER TABLE USERS ADD GOOGLEID CHARACTER VARYING(64);
+
+UPDATE USERS SET GOOGLEID = EXTID WHERE CLIENTNAME = 'Google2Client';
+
+ALTER TABLE USERS ALTER COLUMN EXTID VARCHAR_IGNORECASE(64) NULL;
+ALTER TABLE USERS ALTER COLUMN CLIENTNAME VARCHAR_IGNORECASE(64) NULL;
+
+UPDATE USERS SET EMAIL = LOWER(EMAIL);
\ No newline at end of file
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/db/db-schema.sql b/phoneblock/src/main/java/de/haumacher/phoneblock/db/db-schema.sql
index 1e67576f..450ecd20 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/db/db-schema.sql
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/db/db-schema.sql
@@ -140,8 +140,9 @@ CREATE TABLE USERS (
 	LOGIN CHARACTER VARYING(255) NOT NULL,
 	PWHASH BINARY VARYING(128) NOT NULL,
 	
-	CLIENTNAME CHARACTER VARYING(64) NOT NULL,
-	EXTID CHARACTER VARYING(255),
+	CLIENTNAME CHARACTER VARYING(64) NULL,
+	EXTID CHARACTER VARYING(64) NULL,
+    GOOGLEID CHARACTER VARYING(64) NULL,
 
 	DISPLAYNAME CHARACTER VARYING(255) NOT NULL,
 	EMAIL CHARACTER VARYING(255),
@@ -158,8 +159,9 @@ CREATE TABLE USERS (
 	CONSTRAINT USERS_PK PRIMARY KEY (ID)
 );
 
-CREATE INDEX USERS_CLIENTNAME_IDX ON USERS (CLIENTNAME,EXTID);
 CREATE UNIQUE INDEX USERS_UN_INDEX_4 ON USERS (LOGIN);
+CREATE INDEX USERS_EMAIL_INDEX ON USERS (EMAIL);
+CREATE INDEX USERS_GOOGLEID_IDX ON USERS (GOOGLEID);
 
 CREATE TABLE PUBLIC.CONTRIBUTIONS (
 	ID BIGINT NOT NULL AUTO_INCREMENT,
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/mail/MailService.java b/phoneblock/src/main/java/de/haumacher/phoneblock/mail/MailService.java
index c7412a49..87fe8216 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/mail/MailService.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/mail/MailService.java
@@ -21,6 +21,7 @@
 
 import de.haumacher.phoneblock.app.Application;
 import de.haumacher.phoneblock.app.SettingsServlet;
+import de.haumacher.phoneblock.db.DB;
 import de.haumacher.phoneblock.db.DBUserSettings;
 import de.haumacher.phoneblock.db.settings.AnswerBotSip;
 import de.haumacher.phoneblock.mail.check.EMailCheckService;
@@ -104,10 +105,11 @@ public void sendActivationMail(String receiver, String code)
 		LOG.info("Sending activation mail to '" + receiver + "'.");
 
 		Map<String, String> variables = new HashMap<>();
+		variables.put("{name}", DB.toDisplayName(address.getAddress()));
     	variables.put("{code}", code);
     	variables.put("{image}", _appLogoSvg);
     	
-		sendMail("PhoneBlock E-Mail Bestätigung", address, "mail-template", variables);
+		sendMail("PhoneBlock Anmelde-Code", address, "mail-template", variables);
 	}
 
 	public boolean sendHelpMail(DBUserSettings userSettings) {
@@ -176,15 +178,8 @@ public void sendWelcomeMail(DBUserSettings userSettings) {
 	}
 
 	private Map<String, String> buildVariables(DBUserSettings userSettings) {
-		String name = userSettings.getDisplayName();
-		int atIndex = name.indexOf('@');
-		if (atIndex > 0) {
-			name = name.substring(0, atIndex);
-		}
-		name = toUpperCaseStart(name);
-		
 		Map<String, String> variables = new HashMap<>();
-		variables.put("{name}", name);
+		variables.put("{name}", userSettings.getDisplayName());
 		variables.put("{userName}", userSettings.getLogin());
 		variables.put("{lastAccess}", formatDateTime(userSettings.getLastAccess()));
 		variables.put("{image}", _appLogoSvg);
@@ -335,37 +330,4 @@ private Session getSession() throws AddressException {
 		return _session;
 	}
 
-	private static String toUpperCaseStart(String name) {
-		StringBuilder result = new StringBuilder();
-		boolean first = true;
-		for (String part : name.replace('.', ' ').replace('_', ' ').split("\\s+")) {
-			if (part.length() == 0) {
-				continue;
-			}
-			
-			if (first) {
-				first = false;
-			} else {
-				result.append(' ');
-			}
-			
-			boolean firstPart = true;
-			for (String subPart : part.split("-")) {
-				if (subPart.length() == 0) {
-					continue;
-				}
-
-				if (firstPart) {
-					firstPart = false;
-				} else {
-					result.append('-');
-				}
-				result.append(Character.toUpperCase(subPart.charAt(0)));
-				result.append(subPart.substring(1));
-			}
-		}
-
-		return result.toString();
-	}
-
 }
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/mail/mail-template.html b/phoneblock/src/main/java/de/haumacher/phoneblock/mail/mail-template.html
index 83f0a2a2..e2202a4f 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/mail/mail-template.html
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/mail/mail-template.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>PhoneBlock account creation</title>
+<title>PhoneBlock login code</title>
 </head>
 
 <body>
@@ -9,11 +9,11 @@
 </div>
 
 <h2>
-Hallo PhoneBlock-Nutzer,
+Hallo {name},
 </h2>
 
 <p>
-hier kommt der Bestätigungscode für Deinen <i>PhoneBlock</i>-Account. Um Deine E-Mail-Adresse zu verifizieren, 
+hier kommt der Anmeldecode für Deinen <i>PhoneBlock</i>-Account. Um Deine E-Mail-Adresse zu verifizieren, 
 trage bitte den folgenden Code in die Anmelde-Maske ein, die Du gerade in Deinem Browser offen hast:
 </p>
 
@@ -22,7 +22,7 @@ <h2>
 </p>
 
 <p>
-Wenn Du keinen <i>PhoneBlock</i>-Account erstellen willst, kannst Du diese E-Mail getrost ignorieren.
+Wenn Du Dich nicht bei <i>PhoneBlock</i> anmelden willst, kannst Du diese E-Mail getrost ignorieren.
 </p>
 
 <p>
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/mail/mail-template.txt b/phoneblock/src/main/java/de/haumacher/phoneblock/mail/mail-template.txt
index b7fb7971..c25a4c5c 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/mail/mail-template.txt
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/mail/mail-template.txt
@@ -1,11 +1,11 @@
-Hallo PhoneBlock-Nutzer,
+Hallo {name},
 
-hier kommt der Bestätigungscode für Deinen PhoneBlock-Account. Um Deine E-Mail-Adresse zu verifizieren, 
+hier kommt der Anmeldecode für Deinen PhoneBlock-Account. Um Deine E-Mail-Adresse zu verifizieren, 
 trage bitte den folgenden Code in die Anmelde-Maske ein, die Du gerade in Deinem Browser offen hast:
 
         {code}
 
-Wenn Du keinen PhoneBlock-Account erstellen willst, kannst Du diese E-Mail getrost ignorieren.
+Wenn Du Dich nicht bei PhoneBlock anmelden willst, kannst Du diese E-Mail getrost ignorieren.
 
 Vielen Dank für Dein Interesse an PhoneBlock!
 Dein PhoneBlock-Server
diff --git a/phoneblock/src/main/java/de/haumacher/phoneblock/users/UserAdd.java b/phoneblock/src/main/java/de/haumacher/phoneblock/users/UserAdd.java
index f4dff2fc..84914a30 100644
--- a/phoneblock/src/main/java/de/haumacher/phoneblock/users/UserAdd.java
+++ b/phoneblock/src/main/java/de/haumacher/phoneblock/users/UserAdd.java
@@ -36,7 +36,7 @@ public static void main(String[] args) throws SQLException, IOException {
 		} else {
 			login = args[0];
 		}
-		String passwd = db.createUser(RegistrationServlet.IDENTIFIED_BY_EMAIL, login, login, login);
+		String passwd = db.createUser(login, login);
 		
 		System.out.println(passwd);
 		
diff --git a/phoneblock/src/main/webapp/anrufbeantworter/index.jsp b/phoneblock/src/main/webapp/anrufbeantworter/index.jsp
index e655b63c..bdf38a21 100644
--- a/phoneblock/src/main/webapp/anrufbeantworter/index.jsp
+++ b/phoneblock/src/main/webapp/anrufbeantworter/index.jsp
@@ -68,21 +68,11 @@
 	if (userName == null) { 
 %>
 		<p>
-		Als erstes musst Du Dich 
-		<a href="<%=request.getContextPath()%>/signup.jsp?locationAfterLogin=/anrufbeantworter/#register">bei PhoneBlock registrieren</a>.
-		Wenn Du bereits einen PhoneBlock-Account hast, <a href="<%=request.getContextPath()%>/login.jsp?locationAfterLogin=/anrufbeantworter/#create">melde Dich an</a>. 
+		Als erstes musst Du Dich bei PhoneBlock registrieren bzw. anmelden, um mit der Einrichtung zu beginnen.
 		</p>
 		
 		<div class="columns">
-		  <div class="column is-half">
-			<a class="button is-medium is-primary is-fullwidth" href="<%=request.getContextPath()%>/signup.jsp?locationAfterLogin=/anrufbeantworter/#create">
-			    <span class="icon">
-					<i class="fa-solid fa-user-plus"></i>
-			    </span>
-				<span>Registrieren</span>			
-			</a>
-		  </div>
-		  <div class="column is-half">
+		  <div class="column is-half is-offset-one-quarter">
 			<a class="button is-medium is-info is-fullwidth" href="<%=request.getContextPath()%>/login.jsp?locationAfterLogin=/anrufbeantworter/#create">
 			    <span class="icon">
 					<i class="fa-solid fa-right-to-bracket"></i>
@@ -105,12 +95,12 @@
 			  <div class="message-body">
 				<div class="field">
 				  <label class="label">Benutzername</label>
-				  <div class="control"><code id="login"><%= JspUtil.quote(userName) %></code> <a id="login_" title="In die Zwischenablage kopieren." class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
+				  <div class="control"><code id="login"><%= JspUtil.quote(userName) %></code><a id="login_" title="In die Zwischenablage kopieren." class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
 				  <p class="help">Diesen Wert musst du als Benutzernamen für den <a href="<%=request.getContextPath()%>/setup.jsp">Abruf der Blocklist</a> eintragen. </p>
 				</div>
 				<div class="field">
 				  <label class="label">Passwort</label>
-				  <div class="control"><code id="passwd"><%= JspUtil.quote(token) %></code> <a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
+				  <div class="control"><code id="passwd"><%= JspUtil.quote(token) %></code><a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
 				  <p class="help">Dieses Passwort musst Du für die <a href="<%=request.getContextPath()%><%=SettingsServlet.PATH%>">Anmeldung an dieser Webseite</a> verwenden. </p>
 				  <p class="help">
 				  	Bitte notiere Dir das Passwort (oder speichere es am besten in einem <a href="https://keepass.info/">Passwort-Manager</a>), 
@@ -144,7 +134,7 @@
 		
 		<div class="columns">
 			<div class="column is-8 is-offset-2">
-	  			<img class="image" alt="DynDNS einrichten" src="app/01-create-answerbot.png"/>
+	  			<img class="image appscreen" alt="DynDNS einrichten" src="app/01-create-answerbot.png"/>
 	  		</div>
 		</div>
 		
@@ -165,7 +155,7 @@
 		
 		<div class="columns">
 			<div class="column is-8 is-offset-2">
-	  			<img class="image" alt="DynDNS einrichten" src="app/02-enable-dyndns.png"/>
+	  			<img class="image appscreen" alt="DynDNS einrichten" src="app/02-enable-dyndns.png"/>
 	  		</div>
 		</div>
 		
@@ -175,7 +165,7 @@
 		
 		<div class="columns">
 			<div class="column is-8 is-offset-2">
-	  			<img class="image" alt="DynDNS einrichten" src="app/03-create-dyndns-account.png"/>
+	  			<img class="image appscreen" alt="DynDNS einrichten" src="app/03-create-dyndns-account.png"/>
 	  		</div>
 		</div>
 		
@@ -391,7 +381,7 @@
 		
 		<div class="columns">
 			<div class="column is-8 is-offset-2">
-	  			<img class="image" alt="Zugriff aus dem Internet" src="app/06-register-answerbot.png"/>
+	  			<img class="image appscreen" alt="Zugriff aus dem Internet" src="app/06-register-answerbot.png"/>
 	  		</div>
 		</div>
 		
@@ -402,7 +392,7 @@
 
 		<div class="columns">
 			<div class="column is-8 is-offset-2">
-	  			<img class="image" alt="Anrufbeantworter verbunden" src="app/10-answerbot-activated.png"/>
+	  			<img class="image appscreen" alt="Anrufbeantworter verbunden" src="app/10-answerbot-activated.png"/>
 	  		</div>
 		</div>
 		
diff --git a/phoneblock/src/main/webapp/error-not-allowed.jsp b/phoneblock/src/main/webapp/error-not-allowed.jsp
index 7d359dca..57ebfc77 100644
--- a/phoneblock/src/main/webapp/error-not-allowed.jsp
+++ b/phoneblock/src/main/webapp/error-not-allowed.jsp
@@ -1,4 +1,6 @@
 <!DOCTYPE html>
+<%@page import="de.haumacher.phoneblock.app.SettingsServlet"%>
+<%@page import="de.haumacher.phoneblock.app.LoginServlet"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isErrorPage="true" session="false"%>
 <html>
 <head>
@@ -13,7 +15,7 @@
 			<h1>Diese Seite kann nicht im Browser angezeigt werden</h1>
 
 			<p>
-				Deinen Addressbuch-Link, den Du bei der <a href="<%=request.getContextPath()%>/signup.jsp">Anmeldung</a>
+				Deinen Addressbuch-Link, den Du bei der <a href="<%=request.getContextPath()%>/login.jsp">Anmeldung</a>
 				erhalten hast, musst Du wie in der <a href="<%=request.getContextPath()%>/setup.jsp">Installationsanleitung</a> 
 				beschrieben zusammen mit Deiner
 				E-Mail-Adresse und dem Dir zugeschickten Passwort in Deiner
@@ -26,9 +28,9 @@
 			<div class="tile is-ancestor">
 				<div class="tile is-parent is-6">
 					<a class="tile is-child notification is-primary"
-						href="<%=request.getContextPath()%>/signup.jsp">
+						href="<%=request.getContextPath()%>/login.jsp<%=LoginServlet.locationParamFirst(SettingsServlet.PATH)%>">
 						<p class="title">Anmeldedaten vergessen?</p>
-						<p class="subtitle">Einfach nochmal registrieren!</p>
+						<p class="subtitle">Einfach nochmal registrieren und Passwort zurücksetzen!</p>
 					</a>
 				</div>
 
diff --git a/phoneblock/src/main/webapp/faq.jsp b/phoneblock/src/main/webapp/faq.jsp
index fba72e27..f5113f45 100644
--- a/phoneblock/src/main/webapp/faq.jsp
+++ b/phoneblock/src/main/webapp/faq.jsp
@@ -286,7 +286,7 @@
 	
 	<div class="tile is-ancestor">
 		<div class="tile is-parent is-6">
-			<a class="tile is-child notification is-primary" href="<%=request.getContextPath() %>/signup.jsp">
+			<a class="tile is-child notification is-primary" href="<%=request.getContextPath() %>/login.jsp">
 				<p class="title">Klar zum Loslegen?</p>
 				<p class="subtitle">PhoneBlock-Account erstellen!</p>
 			</a>
diff --git a/phoneblock/src/main/webapp/header.jspf b/phoneblock/src/main/webapp/header.jspf
index 178b4006..fd241fbd 100644
--- a/phoneblock/src/main/webapp/header.jspf
+++ b/phoneblock/src/main/webapp/header.jspf
@@ -94,13 +94,6 @@
 			<div class="navbar-item">
 				<div class="buttons">
 					<% if (LoginFilter.getAuthenticatedUser(request.getSession(false)) == null) { %>
-					<a class="button is-primary" href="<%=request.getContextPath() %>/signup.jsp">
-						<span class="icon">
-							<i class="fa-solid fa-user-plus"></i>
-          				</span>
-						<strong>Sign up</strong>
-					</a>
-					
 					<a class="button is-light" href="<%=request.getContextPath() %>/login.jsp<%= LoginServlet.locationParamFirst(request) %>">
 						<span class="icon">
 							<i class="fa-solid fa-right-to-bracket"></i>
diff --git a/phoneblock/src/main/webapp/index.jsp b/phoneblock/src/main/webapp/index.jsp
index b35ed466..4e9c8201 100644
--- a/phoneblock/src/main/webapp/index.jsp
+++ b/phoneblock/src/main/webapp/index.jsp
@@ -140,7 +140,7 @@
 
 	<div class="tile is-ancestor">
 		<div class="tile is-parent is-6">
-			<a class="tile is-child notification is-primary" href="<%=request.getContextPath() %>/signup.jsp">
+			<a class="tile is-child notification is-primary" href="<%=request.getContextPath() %>/login.jsp">
 				<p class="title">Klar zum Loslegen?</p>
 				<p class="subtitle">PhoneBlock-Account erstellen!</p>
 			</a>
diff --git a/phoneblock/src/main/webapp/login.jsp b/phoneblock/src/main/webapp/login.jsp
index 66df6683..3798085e 100644
--- a/phoneblock/src/main/webapp/login.jsp
+++ b/phoneblock/src/main/webapp/login.jsp
@@ -1,4 +1,14 @@
+<%
+	// If already logged in, forward to final destination.
+	String userName = LoginFilter.getAuthenticatedUser(request);
+	if (userName != null) {
+		LoginServlet.redirectToLocationAfterLogin(request, response);
+		return;
+	}
+%>
 <!DOCTYPE html>
+<%@page import="de.haumacher.phoneblock.app.LoginFilter"%>
+<%@page import="de.haumacher.phoneblock.app.EMailVerificationServlet"%>
 <%@page import="de.haumacher.phoneblock.app.SettingsServlet"%>
 <%@page import="java.net.URLEncoder"%>
 <%@page import="java.net.URL"%>
@@ -15,10 +25,6 @@
 <jsp:include page="head-content.jspf"></jsp:include>
 </head>
 
-<%
-	boolean error = request.getAttribute("error") != null;
-	String userActive = error ? "is-active" : "";
-%>
 <body>
 <jsp:include page="header.jspf"></jsp:include>
 
@@ -29,12 +35,19 @@
 	
 	<div class="content">
 		<p>
-			Um Deine PhoneBlock-Einstellungen zu bearbeiten, musst Du Dich anmelden. Nachdem Du Dich angemeldet hast,
-			kannst Du z.B. festlegen, ab welcher Konfidenz eine Telefonnummer zu Deiner Blocklist hinzugefügt wird  
-			oder welche Länge Deine Blocklist höchstens haben darf.
+			Um PhoneBlock als <a href="<%=request.getContextPath() %>/setup.jsp">Blocklisten-Telefonbuch</a>, 
+			oder <a href="<%=request.getContextPath() %>/anrufbeantworter/">intelligenten Anrufbeantworter</a> einzurichten, 
+			musst Du Dich zuvor hier anmelden.
 		</p>
+
+		<p> 
+			Nach der Anmeldung kannst Du in den <a href="<%=request.getContextPath() %><%=SettingsServlet.PATH %>">PhoneBlock-Einstellungen</a>
+			 z.B. festlegen, ab welcher Konfidenz eine Telefonnummer zu Deiner
+			Blocklist hinzugefügt wird oder welche Länge Deine Blocklist höchstens haben darf.
+		</p>
+
 		<p>
-			 Auch die Verwaltung Deiner <a href="<%=request.getContextPath() %>/anrufbeantworter">PhoneBlock-Anrufbeantworter</a>
+			 Auch die Verwaltung Deiner <a href="<%=request.getContextPath() %>/ab/">PhoneBlock-Anrufbeantworter</a>
 			 erfordert eine Anmeldung.
 		</p> 
 	</div>
@@ -77,12 +90,93 @@
 				    </button>
 				  </p>
 				</div>
+				
+				<p class="help">
+					 Wenn Du einen Google-Account hast, dann kannst Du Dich mit diesem bequem bei PhoneBlock anmelden.  
+				</p>
+				
 				</form>
 			</div>
 			</div>
 		</div>
 	</nav>
+
+<%
+	Object emailMessage = request.getAttribute(EMailVerificationServlet.VERIFY_ERROR_ATTR);
+	boolean emailError = emailMessage != null;
+	String emailActive = emailError ? "is-active" : "";
+	String inputClass = emailError ? "input is-danger" : "input";
+%>
+	<nav class="panel">
+		<p class="panel-heading"><a href="#emailLogin" data-action="collapse"><i class="fas fa-envelope"></i> <span>Mit E-Mail anmelden</span></a></p>
+		<div id="emailLogin" class="is-collapsible <%=emailActive%>">
+			<form action="<%= request.getContextPath() %><%= EMailVerificationServlet.LOGIN_WEB%>" method="post" enctype="application/x-www-form-urlencoded">
+	  		<div class="panel-block">
+	  		<div class="content">
+<% if (location != null) { %>
+			    <input type="hidden" name="<%=LoginServlet.LOCATION_ATTRIBUTE%>" value="<%= JspUtil.quote(location) %>">
+<% } %>
+				<div class="field">
+					<label class="label">E-Mail</label>
+					<div class="control has-icons-left has-icons-right">
+					    <input name="email" 
+					    	class="<%= inputClass %>" 
+					    	type="email" 
+					    	placeholder="Deine E-Mail-Adresse" 
+					    	value="<%= JspUtil.quote(request.getAttribute("email")) %>"
+					    />
+					    <span class="icon is-small is-left">
+					      <i class="fas fa-envelope"></i>
+					    </span>
+<% if (emailError) { %>
+					    <span class="icon is-small is-right">
+					      <i class="fas fa-exclamation-triangle"></i>
+					    </span>
+<% } %>
+					</div>
+<% if (emailError) { %>
+					<p class="help is-danger">
+						<%= JspUtil.quote(request.getAttribute("message")) %>
+					</p>
+<% } %>
+				</div>
+
+				<div class="field">
+				  <div class="control">
+	  				<label class="checkbox">
+					  <input type="checkbox" name="<%=LoginServlet.REMEMBER_PARAM%>" value="true"/>
+					  <span>Auf diesem Gerät angemeldet bleiben (setzt ein <a href="<%=request.getContextPath()%>/datenschutz.jsp">Cookie</a>)</span>
+					</label>
+				  </div>
+				</div>
+
+				<div class="field is-grouped">
+				  <p class="control">
+				    <button class="button is-primary" type="submit">
+			          <span class="icon">
+					      <i class="fa-solid fa-right-to-bracket"></i>
+					  </span>
+				      <span>Code anfordern</span>
+				    </button>
+				  </p>
+				</div>
+				
+				<p class="help">
+					 Du erhälst einen Code an die angegebene E-Mail-Adresse, mit dem Du Dich anmelden kannst. 
+					 Wenn Du schon einen PhoneBlock-Nutzernamen und ein Passwort hast, dann kannst Du Dich auch
+					 mit diesem anmelden, siehe unten.  
+				</p>
+			</div>
+			</div>
+			</form>
+		</div>
+	</nav>
 	
+<%
+	boolean loginError = request.getAttribute(LoginServlet.LOGIN_ERROR_ATTR) != null;
+	String userActive = loginError ? "is-active" : "";
+%>
+
 	<nav class="panel">
 		<p class="panel-heading">
 			<a href="#loginForm" data-action="collapse"><i class="fas fa-user"></i> <span>Mit PhoneBlock-Nutzernamen anmelden</span></a>
@@ -90,7 +184,7 @@
 		<div id="loginForm" class="is-collapsible <%=userActive%>">
 			<div class="panel-block">
 	  		<div class="content">
-				<form action="<%=request.getContextPath()%>/login" method="post">
+				<form action="<%=request.getContextPath()%><%=LoginServlet.PATH %>" method="post">
 				<%
 					if (location != null) {
 				%>
@@ -108,7 +202,7 @@
 				      <i class="fas fa-check"></i>
 				    </span>
 				  </p>
-				  <p class="help">Verwende den Benutzernamen, den Du bei der <a href="<%=request.getContextPath()%>/signup.jsp<%=locationParamFirst%>">Registrierung mit E-Mail-Adresse</a> erhalten hast.</p>
+				  <p class="help">Verwende den Benutzernamen, den Du bei Deiner Anmeldung mit Google oder E-Mail-Adresse erhalten hast.</p>
 				</div>
 				<div class="field">
 				  <p class="control has-icons-left">
@@ -117,11 +211,14 @@
 				      <i class="fas fa-lock"></i>
 				    </span>
 				  </p>
-				  <% if (error) {%>
+<% if (loginError) {%>
 					  <p class="help is-danger">Die Anmeldedaten stimmen nicht überein, bitte überprüfe die Eingaben und versuche es noch einmal.</p>
-				  <% } else { %>
-					  <p class="help">Das Passwort wurde Dir nach der <a href="<%=request.getContextPath()%>/signup.jsp<%=locationParamFirst%>">Registrierung</a> angezeigt.</p>
-				  <% } %>
+<% } else { %>
+					  <p class="help">
+					  	Das Passwort wurde Dir nach der ersten Anmeldung angezeigt. Wenn Du das Passwort nicht mehr zur Hand hast, 
+					  	dann melde Dich einfach mit Google oder Deiner E-Mail-Adresse an, siehe oben.
+					  </p>
+<% } %>
 				</div>
 
 				<div class="field">
@@ -146,19 +243,6 @@
 				</form>
 			</div>
 			</div>
-			
-			<div class="panel-block">
-				<div class="content">
-				<p>
-				Wenn Du noch keinen PhoneBlock-Account hast, dann <a href="<%=request.getContextPath()%>/signup.jsp<%=locationParamFirst%>">registriere Dich</a>!
-				</p>
-
-				<p>
-				Wenn Du das Passwort vergessen hast, kannst Du dieselbe E-Mail-Adresse einfach erneut registrieren. Aber 
-				Vorsicht: Danach musst Du das <a href="<%=request.getContextPath()%>/setup.jsp">Passwort auch in Deiner Fritz!Box ändern</a>.
-				</p>
-				</div>
-			</div>
 		</div>
 	</nav>	
 </section>
diff --git a/phoneblock/src/main/webapp/phone-info.jsp b/phoneblock/src/main/webapp/phone-info.jsp
index 42ee3235..d5f99d39 100644
--- a/phoneblock/src/main/webapp/phone-info.jsp
+++ b/phoneblock/src/main/webapp/phone-info.jsp
@@ -509,7 +509,7 @@
 	</div>
 
 	<div class="tile is-parent is-6">
-		<a class="tile is-child notification is-info" href="<%=request.getContextPath() %>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">
+		<a class="tile is-child notification is-info" href="<%=request.getContextPath() %>/login.jsp<%= LoginServlet.locationParamFirst("/setup.jsp") %>">
 			<p class="title">PhoneBlock installieren</p>
 			<p class="subtitle">Noch nicht installiert? Dann los!</p>
 		</a>
@@ -522,7 +522,7 @@
 
 <div class="tile is-ancestor">
 	<div class="tile is-parent is-6">
-		<a class="tile is-child notification is-primary" href="<%=request.getContextPath() %>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">
+		<a class="tile is-child notification is-primary" href="<%=request.getContextPath() %>/login.jsp<%= LoginServlet.locationParamFirst("/setup.jsp") %>">
 			<p class="title">PhoneBlock installieren</p>
 			<p class="subtitle">Account erstellen und einrichten!</p>
 		</a>
diff --git a/phoneblock/src/main/webapp/phoneblock-style.css b/phoneblock/src/main/webapp/phoneblock-style.css
index 4b3228bb..ff08a925 100644
--- a/phoneblock/src/main/webapp/phoneblock-style.css
+++ b/phoneblock/src/main/webapp/phoneblock-style.css
@@ -112,3 +112,12 @@
 .token {
 	padding-right:5px;
 }
+
+.copyToClipboard {
+	padding-left: 0.5ex;	
+}
+
+.appscreen {
+	border: 5px solid #555;
+	border-radius: 10px;
+}
\ No newline at end of file
diff --git a/phoneblock/src/main/webapp/settings.jsp b/phoneblock/src/main/webapp/settings.jsp
index f00d25a4..0b563c24 100644
--- a/phoneblock/src/main/webapp/settings.jsp
+++ b/phoneblock/src/main/webapp/settings.jsp
@@ -45,7 +45,8 @@
 				UserSettings settings = DBService.getInstance().getSettings(userName);
 			%>
 			<p>
-				Wilkommen <%= JspUtil.quote(settings.getDisplayName()) %>.
+				Willkommen <%= JspUtil.quote(settings.getDisplayName()) %><% if (settings.getEmail() != null) { %>				
+				(<%= JspUtil.quote(settings.getEmail()) %>)<% } %>.
 			</p>
 			
 			<form action="<%= request.getContextPath() %><%=SettingsServlet.PATH%>" method="post">
@@ -60,20 +61,24 @@
 
 				<div class="field">
 				  <label class="label">Internetadresse des CardDAV-Servers</label>
-				  <div class="control"><code id="url">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code> <a id="url_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
+				  <div class="control"><code id="url">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code><a id="url_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
 				</div>
 
 <% } %>			
 				<div class="field">
 				  <label class="label">Benutzername</label>
-				  <div class="control"><code id="login"><%= JspUtil.quote(userName) %></code> <a id="login_" title="In die Zwischenablage kopieren." class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
-				  <p class="help">Diesen Wert musst du als Benutzernamen für den <a href="<%=request.getContextPath()%>/setup.jsp">Abruf der Blocklist</a> eintragen. </p>
+				  <div class="control"><code id="login"><%= JspUtil.quote(userName) %></code><a id="login_" title="In die Zwischenablage kopieren." class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
+				  <p class="help">
+				  	Diesen Wert musst du als Benutzernamen für den <a href="<%=request.getContextPath()%>/setup.jsp">Abruf der Blocklist</a> eintragen.
+				  	Dein Passwort wurde Dir nach Deiner ersten Anmeldung angezeigt. Wenn du dieses nicht mehr weißt, dann kannst Du unten auf der Seite
+				  	ein neues Passwort erstellen lassen. Aber Vorsicht: Das alte Passwort wird dadurch ungültig. 
+				  </p>
 				</div>
 					
 <% if (token != null) { %>
 				<div class="field">
 				  <label class="label">Passwort</label>
-				  <div class="control"><code id="passwd"><%= JspUtil.quote(token) %></code> <a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
+				  <div class="control"><code id="passwd"><%= JspUtil.quote(token) %></code><a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
 				  <p class="help">Dieses Passwort musst Du für die <a href="<%=request.getContextPath()%>/setup.jsp">Einrichtung des Telefonbuchs</a> oder für die <a href="<%=request.getContextPath()%><%=SettingsServlet.PATH%>">Anmeldung an dieser Webseite</a> verwenden. </p>
 				  <p class="help">
 				  	Bitte notiere Dir das Passwort (oder speichere es am besten in einem <a href="https://keepass.info/">Passwort-Manager</a>), 
diff --git a/phoneblock/src/main/webapp/setup-android/03-people-sync-install.jsp b/phoneblock/src/main/webapp/setup-android/03-people-sync-install.jsp
index e109d02d..d9ecc382 100644
--- a/phoneblock/src/main/webapp/setup-android/03-people-sync-install.jsp
+++ b/phoneblock/src/main/webapp/setup-android/03-people-sync-install.jsp
@@ -24,11 +24,11 @@
 
 		<div class="columns">
 			<div class="column is-two-fifths">
-	  			<img class="image" alt="Installiere PeopleSync" src="<%=request.getContextPath() %>/setup-android/03-people-sync-install.png"/>
+	  			<img class="image appscreen" alt="Installiere PeopleSync" src="<%=request.getContextPath() %>/setup-android/03-people-sync-install.png"/>
 	  		</div>
 		
 			<div class="column is-two-fifths">
-				<img class="image" alt="Öffne PeopleSync" src="<%=request.getContextPath() %>/setup-android/04-people-sync-open.png"/>
+				<img class="image appscreen" alt="Öffne PeopleSync" src="<%=request.getContextPath() %>/setup-android/04-people-sync-open.png"/>
 			</div>
 		</div>
 		
diff --git a/phoneblock/src/main/webapp/setup-android/05-people-sync-accept.jsp b/phoneblock/src/main/webapp/setup-android/05-people-sync-accept.jsp
index 3042db51..a86e2a43 100644
--- a/phoneblock/src/main/webapp/setup-android/05-people-sync-accept.jsp
+++ b/phoneblock/src/main/webapp/setup-android/05-people-sync-accept.jsp
@@ -22,10 +22,10 @@
 		
 		<div class="columns">
 			<div class="column is-two-fifths">
-	  			<img class="image" alt="Berechtigungen" src="<%=request.getContextPath() %>/setup-android/05-people-sync-accept.png"/>
+	  			<img class="image appscreen" alt="Berechtigungen" src="<%=request.getContextPath() %>/setup-android/05-people-sync-accept.png"/>
 	  		</div>
 			<div class="column is-two-fifths">
-	  			<img class="image" alt="Sync-Intervalle" src="<%=request.getContextPath() %>/setup-android/06-people-sync-sync.png"/>
+	  			<img class="image appscreen" alt="Sync-Intervalle" src="<%=request.getContextPath() %>/setup-android/06-people-sync-sync.png"/>
 	  		</div>
 		</div>
 		
diff --git a/phoneblock/src/main/webapp/setup-android/07-people-sync-add.jsp b/phoneblock/src/main/webapp/setup-android/07-people-sync-add.jsp
index 491bc6fc..87ad896b 100644
--- a/phoneblock/src/main/webapp/setup-android/07-people-sync-add.jsp
+++ b/phoneblock/src/main/webapp/setup-android/07-people-sync-add.jsp
@@ -27,29 +27,29 @@
 		
 		<ol>
 		<li>
-			Wähle die Option "Mit URL und Benutzername anmelden" und gib als "Basis-URL" die Adresse des PhoneBlock-Adressbuchs an: <code id="url">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code> <a id="url_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>.
+			Wähle die Option "Mit URL und Benutzername anmelden" und gib als "Basis-URL" die Adresse des PhoneBlock-Adressbuchs an: <code id="url">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code><a id="url_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>.
 		</li>
 			
 		<li>
-			Bei "Benutzername" trägst Du den Benutzernamen ein, den Du bei der <a href="<%=request.getContextPath() %>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">PhoneBlock-Anmeldung</a> erhalten hast<%if (login != null) {%> (<code id="login"><%= login %></code> <a id="login_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>)<%}%>.
+			Bei "Benutzername" trägst Du den Benutzernamen ein, den Du bei der PhoneBlock-Anmeldung erhalten hast<%if (login != null) {%> (<code id="login"><%= login %></code><a id="login_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>)<%}%>.
 		</li>
 			
 		<li>
-			Das Passwort wurde dir nach erfolgreicher Registrierung angezeigt<% if (token != null) {%> (<code id="passwd"><%= token %></code> <a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>)<%}%>.
+			Das Passwort wurde dir nach der ersten Anmeldung angezeigt<% if (token != null) {%> (<code id="passwd"><%= token %></code><a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>)<%}%>.
 		</li>
 		</ol>
 		
 		<p>			
 			Du hast die Daten nicht mehr zur Hand? Macht nichts, einfach 
-			<a href="<%=request.getContextPath() %>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">erneut registrieren</a> oder in den <a href="<%=request.getContextPath() + SettingsServlet.PATH %>">Einstellungen</a> das Passwort zurücksetzen.
+			<a href="<%=request.getContextPath() %>/login.jsp<%= LoginServlet.locationParamFirst(SettingsServlet.PATH) %>">anmelden und in den Einstellungen das Passwort zurücksetzen</a>.
 		</p>
 
 		<div class="columns">
 			<div class="column is-two-fifths">
-	  			<img class="image" alt="Adressbuch hinzufügen" src="<%=request.getContextPath() %>/setup-android/07-people-sync-add.png"/>
+	  			<img class="image appscreen" alt="Adressbuch hinzufügen" src="<%=request.getContextPath() %>/setup-android/07-people-sync-add.png"/>
 	  		</div>
 			<div class="column is-two-fifths">
-	  			<img class="image" alt="Adressbuch hinzufügen" src="<%=request.getContextPath() %>/setup-android/08-people-sync-account.png"/>
+	  			<img class="image appscreen" alt="Adressbuch hinzufügen" src="<%=request.getContextPath() %>/setup-android/08-people-sync-account.png"/>
 	  		</div>
 		</div>
 		
diff --git a/phoneblock/src/main/webapp/setup-android/09-people-sync-account-finished.jsp b/phoneblock/src/main/webapp/setup-android/09-people-sync-account-finished.jsp
index e7f870ac..99351c87 100644
--- a/phoneblock/src/main/webapp/setup-android/09-people-sync-account-finished.jsp
+++ b/phoneblock/src/main/webapp/setup-android/09-people-sync-account-finished.jsp
@@ -22,10 +22,10 @@
 		
 		<div class="columns">
 			<div class="column is-two-fifths">
-	  			<img class="image" alt="Konto ist eingerichtet" src="<%=request.getContextPath() %>/setup-android/09-people-sync-account-finished.png"/>
+	  			<img class="image appscreen" alt="Konto ist eingerichtet" src="<%=request.getContextPath() %>/setup-android/09-people-sync-account-finished.png"/>
 	  		</div>
 			<div class="column is-two-fifths">
-	  			<img class="image" alt="Aboniere die Blocklist" src="<%=request.getContextPath() %>/setup-android/10-people-sync-subscribe.png"/>
+	  			<img class="image appscreen" alt="Aboniere die Blocklist" src="<%=request.getContextPath() %>/setup-android/10-people-sync-subscribe.png"/>
 	  		</div>
 		</div>
 		
diff --git a/phoneblock/src/main/webapp/setup-android/11-spam-contacts.jsp b/phoneblock/src/main/webapp/setup-android/11-spam-contacts.jsp
index 595c67ce..0eec8d8d 100644
--- a/phoneblock/src/main/webapp/setup-android/11-spam-contacts.jsp
+++ b/phoneblock/src/main/webapp/setup-android/11-spam-contacts.jsp
@@ -22,7 +22,7 @@
 		
 		<div class="columns">
 			<div class="column is-two-fifths">
-	  			<img class="image" alt="Konto ist eingerichtet" src="<%=request.getContextPath() %>/setup-android/11-spam-contacts.png"/>
+	  			<img class="image appscreen" alt="Konto ist eingerichtet" src="<%=request.getContextPath() %>/setup-android/11-spam-contacts.png"/>
 	  		</div>
 		</div>
 		
diff --git a/phoneblock/src/main/webapp/setup-android/index.jsp b/phoneblock/src/main/webapp/setup-android/index.jsp
index 09cdab3a..3c848680 100644
--- a/phoneblock/src/main/webapp/setup-android/index.jsp
+++ b/phoneblock/src/main/webapp/setup-android/index.jsp
@@ -34,11 +34,11 @@
 		
 		<div class="columns">
 			<div class="column">
-	  			<img class="image" alt="Öffne Playstore" src="<%=request.getContextPath() %>/setup-android/01-home.png"/>
+	  			<img class="image appscreen" alt="Öffne Playstore" src="<%=request.getContextPath() %>/setup-android/01-home.png"/>
 	  		</div>
 		
 			<div class="column">
-				<img class="image" alt="Suche nach PeopleSync" src="<%=request.getContextPath() %>/setup-android/02-playstore.png"/>
+				<img class="image appscreen" alt="Suche nach PeopleSync" src="<%=request.getContextPath() %>/setup-android/02-playstore.png"/>
 			</div>
 		</div>
 		
diff --git a/phoneblock/src/main/webapp/setup-iphone/index.jsp b/phoneblock/src/main/webapp/setup-iphone/index.jsp
index 7f3a1730..e73acb51 100644
--- a/phoneblock/src/main/webapp/setup-iphone/index.jsp
+++ b/phoneblock/src/main/webapp/setup-iphone/index.jsp
@@ -37,18 +37,18 @@
 %>
 		
    		<ol>
-   		<li><a href="<%=request.getContextPath() %>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">Melde Dich bei PhoneBlock an.</a></li>
+   		<li><a href="<%=request.getContextPath() %>/login.jsp<%= LoginServlet.locationParamFirst(request) %>">Melde Dich bei PhoneBlock an.</a></li>
    		<li>Öffne "Einstellungen" > "Kontakte" > "Accounts". </li>
    		<li>Tippe auf "Account hinzufügen" - "Andere" > "CardDAV-Account hinzufügen".</li>
    		<li>Gib deine Zugangsdaten ein und tippe auf "Weiter".
    			<dl>
 				<dt><b>Server</b></dt>
-				<dd><code id="url">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code> <a id="url_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></dd>
+				<dd><code id="url">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code><a id="url_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></dd>
 
 				<dt><b>Benutzername</b></dt>
 				<dd>
 				<%if (login != null) {%>					
-				<code id="login"><%= login %></code> <a id="login_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>
+				<code id="login"><%= login %></code><a id="login_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>
 				<%} else {%>	
 				Wurde Dir direkt nach der Anmeldung angezeigt.
 				<%}%>
@@ -57,7 +57,7 @@
 				<dt><b>Passwort</b></dt>
 				<dd>
 				<% if (token != null) {%>
-				<code id="passwd"><%= token %></code> <a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>
+				<code id="passwd"><%= token %></code><a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>
 				<%} else {%>
 				Wurde Dir direkt nach der Anmeldung angezeigt.
 				<%}%>
@@ -73,7 +73,7 @@
 
 		<p>			
 			Du hast die Zugangsdaten nicht mehr zur Hand? Macht nichts, einfach 
-			<a href="<%=request.getContextPath() %>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">erneut registrieren</a> oder in den <a href="<%=request.getContextPath() + SettingsServlet.PATH %>">Einstellungen</a> das Passwort zurücksetzen.
+			<a href="<%=request.getContextPath() %>/login.jsp<%= LoginServlet.locationParamFirst(SettingsServlet.PATH) %>">anmelden und in den Einstellungen das Passwort zurücksetzen</a>.
 		</p>
    		
    		<p>
diff --git a/phoneblock/src/main/webapp/setup.jsp b/phoneblock/src/main/webapp/setup.jsp
index f386a938..8ca26e90 100644
--- a/phoneblock/src/main/webapp/setup.jsp
+++ b/phoneblock/src/main/webapp/setup.jsp
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<%@page import="de.haumacher.phoneblock.app.SettingsServlet"%>
 <%@page import="de.haumacher.phoneblock.app.RegistrationServlet"%>
 <%@page import="de.haumacher.phoneblock.app.LoginFilter"%>
 <%@page import="de.haumacher.phoneblock.app.LoginServlet"%>
@@ -25,9 +26,7 @@
   		Object token = RegistrationServlet.getPassword(session);
 %>
 
-<%
-		if (token == null) {
-%>
+<% if (token == null) { %>
 		<p>
 			Für die Installation der Blockliste benötigst Du einen <a href="<%=request.getContextPath()%>/link/fritzbox">"FRITZ!Box"
 			Internetrouter von AVM</a> und einen PhoneBlock-Account. Es muss nicht unbedingt das neuste Modell
@@ -43,17 +42,21 @@
 			<a href="<%=request.getContextPath()%>/anrufbeantworter/">PhoneBlock-Anrufbeantworters</a> den 
 			besseren Schutz vor SPAM-Anrufen.
 		</p>
-			
+
+<%	if (login == null) { %>
 		<div class="columns">
 		  <div class="column is-half is-offset-one-quarter">
-			<a href="<%=request.getContextPath() %>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">
+			<a href="<%=request.getContextPath() %>/login.jsp<%= LoginServlet.locationParamFirst(request) %>">
 				<button class="button is-medium is-info is-fullwidth">PhoneBlock-Account erstellen</button>
 			</a>
 		  </div>
 		</div>
-<%	  		
-	  	} else {
-%>
+<% 	} else { %>
+		<p>
+			Du bist bereits als <code><%= JspUtil.quote(login) %></code> angemeldet, prima! Du kannst sofort loslegen.
+		</p>
+<% 	} %>
+<% } else { %>
 <div class="columns">
   <div class="column">
 	<div class="tile is-ancestor">
@@ -65,17 +68,17 @@
 		
 				<div class="field">
 				  <label class="label">Internetadresse des CardDAV-Servers</label>
-				  <div class="control"><code id="url">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code> <a id="url_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
+				  <div class="control"><code id="url">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code><a id="url_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
 				</div>
 				
 				<div class="field">
 				  <label class="label">Benutzername</label>
-				  <div class="control"><code id="login"><%= JspUtil.quote(login) %></code> <a id="login_" title="In die Zwischenablage kopieren." class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
+				  <div class="control"><code id="login"><%= JspUtil.quote(login) %></code><a id="login_" title="In die Zwischenablage kopieren." class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
 				</div>
 				
 				<div class="field">
 				  <label class="label">Passwort</label>
-				  <div class="control"><code id="passwd"><%= JspUtil.quote(token) %></code> <a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
+				  <div class="control"><code id="passwd"><%= JspUtil.quote(token) %></code><a id="passwd_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></div>
 				</div>
 			</div>
 		</article>
@@ -83,9 +86,7 @@
     </div>
   </div>
 </div>
-<%	  		
-	  	}
-%>
+<% } %>
 		
 		<h2>Melde Dich an Deiner FRITZ!Box an</h2>
 		
@@ -130,42 +131,52 @@
 			Jetzt benötigst Du die Anmelde-Daten Deines PhoneBlock-Accounts. 
 		</p>
 
-		<p>
-			<span class="tag is-danger">1</span> 
-			gib dem Telefonbuch, das als Sperrliste dienen soll, den Namen <code>Blocklist</code>. Du benötigst diesen 
-			Namen nochmals für den nächsten Schritt. Wähle jetzt <span class="tag is-danger">2</span> die Option 
-			<i>Telefonbuch eines Online-Anbieters nutzen</i> aus. Dann kannst Du <span class="tag is-danger">3</span>
-			den Anbieter <i>CardDAV-Anbieter</i> wählen.
-		</p>
+		<ul>
+			<li>
+				<span class="tag is-danger">1</span> 
+				gib dem Telefonbuch, das als Sperrliste dienen soll, den Namen <code>Blocklist</code>. Du benötigst diesen 
+				Namen nochmals für den nächsten Schritt.
+			</li>
 
-		<p>
-			Fast geschafft, jetzt kommen die Anmeldedaten <span class="tag is-danger">4</span>! Trage die URL
-			von des PhoneBlock-Adressbuchs in das Feld <i>Internetadresse des CardDAV-Servers</i> ein:
-		</p>
-		
-		<div class="columns">
-		  <div class="column is-8 is-offset-2">
-			<code id="url2">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code> <a id="url2_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>
-		  </div>
-		</div>
-		
-		<p>
-			Trage den Benutzernamen <%if (login != null) {%> <code id="login2"><%= JspUtil.quote(login) %></code> <a id="login2_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a><%} %>, den Du bei der
-			<a href="<%=request.getContextPath() %>/signup.jsp">Registrierung</a> erhalten hast, in das Feld 
-			<i>Benutzername</i> ein. Am besten überträgst Du ihn mit Cut&amp;Paste.
-		</p>
-		
-		<p>
-			Das Passwort<%if (token == null) {%>, 
-			das Du bei der <a href="<%=request.getContextPath() %>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">Registrierung</a> erhalten 
-			hast, <%} else  {%> <code id="passwd2"><%= JspUtil.quote(token) %></code> <a id="passwd2_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>,<%}%> muss Du jetzt noch in das Feld
-			<i>Passwort</i> in dem Formular in der Fritz!Box eintragen.
-		</p>
-		
-		<p>
-			Jetzt kannst Du <span class="tag is-danger">5</span> die Anlage des neuen Telefonbuchs bestätigen. Bitte beachte: Wähle <b>keines Deiner Telefone</b> 
-			bei dem Punkt "Telefon-Zuordnung" aus! Ansonsten findest Du auf Deinem Telefon nur noch SPAM-Anrufer in den Kontakten.  
-		</p>
+			<li>
+				Wähle jetzt <span class="tag is-danger">2</span> die Option 
+				<i>Telefonbuch eines Online-Anbieters nutzen</i> aus.
+			</li>
+
+			<li>
+				Dann kannst Du <span class="tag is-danger">3</span>
+				den Anbieter <i>CardDAV-Anbieter</i> wählen.
+			</li>
+
+			<li>
+				Fast geschafft, jetzt kommen die Anmeldedaten <span class="tag is-danger">4</span>. Am besten Du überträgst sie mit Cut&amp;Paste, um Tippfehler zu vermeiden!
+				
+				<ul>
+					<li>
+						Trage die URL von des PhoneBlock-Adressbuchs in das Feld <i>Internetadresse des CardDAV-Servers</i> ein:
+						<code id="url2">https://phoneblock.net<%=request.getContextPath() %>/contacts/</code><a id="url2_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>
+					</li>
+
+					<li>
+						Trage den Benutzernamen <%if (login != null) {%> <code id="login2"><%= JspUtil.quote(login) %></code><a id="login2_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a><%} %>, den Du bei der
+						<a href="<%=request.getContextPath() %>/login.jsp<%= LoginServlet.locationParamFirst(SettingsServlet.PATH) %>">Registrierung</a> erhalten hast, in das Feld 
+						<i>Benutzername</i> ein. 
+					</li>
+
+					<li>
+						Das Passwort<%if (token == null) {%>, 
+						das Du bei der <a href="<%=request.getContextPath() %>/login.jsp<%= LoginServlet.locationParamFirst(SettingsServlet.PATH) %>">Registrierung</a> erhalten 
+						hast, <%} else  {%> <code id="passwd2"><%= JspUtil.quote(token) %></code><a id="passwd2_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a>,<%}%> muss Du jetzt noch in das Feld
+						<i>Passwort</i> eintragen werden.
+					</li>
+				</ul>
+			</li>
+
+			<li>
+				Jetzt kannst Du <span class="tag is-danger">5</span> die Anlage des neuen Telefonbuchs bestätigen. Bitte beachte: Wähle <b>keines Deiner Telefone</b> 
+				bei dem Punkt "Telefon-Zuordnung" aus! Ansonsten findest Du auf Deinem Telefon nur noch SPAM-Anrufer in den Kontakten.  
+			</li>
+		</ul>
 		
 		<div class="columns">
 		  <div class="column is-8 is-offset-2">
diff --git a/phoneblock/src/main/webapp/signup-code.jsp b/phoneblock/src/main/webapp/signup-code.jsp
index 63ff64bd..359e0d15 100644
--- a/phoneblock/src/main/webapp/signup-code.jsp
+++ b/phoneblock/src/main/webapp/signup-code.jsp
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<%@page import="de.haumacher.phoneblock.app.EMailVerificationServlet"%>
 <%@page import="de.haumacher.phoneblock.app.RegistrationServlet"%>
 <%@page import="de.haumacher.phoneblock.app.LoginServlet"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" session="false"%>
@@ -17,12 +18,13 @@
 <section class="section">
 <div class="content">
 
-<h1>E-Mail bestätigen</h1>
-
-<p>
-	Eine E-Mail wurde an die Adresse <code><%= JspUtil.quote(request.getAttribute("email")) %></code> gesendet. 
-	Bitte schau in Deiner Mailbox nach und kopiere den Code.
-</p>
+<% 
+String location = LoginServlet.location(request); 
+Object errorMessage = request.getAttribute(RegistrationServlet.REGISTER_ERROR_ATTR);
+boolean hasError = errorMessage != null;
+String inputClass = hasError ? "input is-danger" : "input";
+Object rememberMe = request.getParameter(LoginServlet.REMEMBER_PARAM); 
+%>
 
 <div class="columns">
   <div class="column">
@@ -33,61 +35,45 @@
 	        <p class="subtitle">E-Mail-Adresse bestätigen.</p>
 	        <div class="content">
 				<p>
-					Bitte bestätige Deine E-Mail-Adresse, indem Du den Code aus der Anmelde-E-Mail hier eingibst.
+					Eine E-Mail wurde an die Adresse <code><%= JspUtil.quote(request.getAttribute("email")) %></code> gesendet. 
+					Bitte schau in Deiner Mailbox nach und gib den Code hier ein. 
 				</p>
-<%
-				String location = LoginServlet.location(request);
-%>
 				<form action="<%= request.getContextPath() %><%=RegistrationServlet.REGISTER_WEB%>" method="post" enctype="application/x-www-form-urlencoded">
 					<div class="field">
-<%
-				  		Object message = request.getAttribute("message");
-%>
 					  <label class="label">Code</label>
 					  <div class="control has-icons-left has-icons-right">
-						<%
-							if (location != null) {
-						%>
+<% if (location != null) { %>
 					    <input type="hidden" name="<%=LoginServlet.LOCATION_ATTRIBUTE%>" value="<%= JspUtil.quote(location) %>">
-						<%
-							}
-						%>
+<% } %>
+<% if (rememberMe != null) { %>
+					    <input type="hidden" name="<%=LoginServlet.REMEMBER_PARAM%>" value="<%= JspUtil.quote(rememberMe) %>">
+<% } %>
 
-					    <input name="code" class="input<%= message != null ? " is-danger" : "" %>" type="text" placeholder="Bestätigungscode" value="">
+					    <input name="code" class="<%= inputClass %>" type="text" placeholder="Bestätigungscode" value="">
 					    <span class="icon is-small is-left">
 					      <i class="fa-solid fa-barcode"></i>
 					    </span>
-<%
-						if (message != null) {
-%>
+<% if (hasError) { %>
 						    <span class="icon is-small is-right">
 						      <i class="fas fa-exclamation-triangle"></i>
 							</span>
-<%
-						}
-%>
+<% } %>
 					  </div>
-<%
-					  	if (message != null) {
-%>
+<% if (hasError) { %>
 							<p class="help is-danger">
-								<%= JspUtil.quote(request.getAttribute("message")) %>
-								<a href="<%=request.getContextPath()%>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">Nochmal probieren</a>.								
+								<%= JspUtil.quote(errorMessage) %>
+								<a href="<%=request.getContextPath()%><%=request.getAttribute(EMailVerificationServlet.RESTART_PAGE_ATTR)%><%= LoginServlet.locationParamFirst(request) %>">Nochmal probieren</a>.								
 							</p>
-<%
-						} else {
-%>
+<% } else { %>
 							<p class="help is-info">
 								Keine E-Mail erhalten? Prüfe bitte Deinen Spam-Ordner!
-								<a href="<%=request.getContextPath()%>/signup.jsp<%= LoginServlet.locationParamFirst(request) %>">Nochmal probieren</a>.								
+								<a href="<%=request.getContextPath()%><%=request.getAttribute(EMailVerificationServlet.RESTART_PAGE_ATTR)%><%= LoginServlet.locationParamFirst(request) %>">Nochmal probieren</a>.								
 							</p>
-<%							
-					  	}
-%>
+<% } %>
 					</div>		
 							
 					<div class="buttons is-right">
-				    	<button class="button is-link" type="submit">Account erstellen</button>
+				    	<button class="button is-link" type="submit">Anmelden</button>
 					</div>
 				</form>
 	        </div>
diff --git a/phoneblock/src/main/webapp/signup.jsp b/phoneblock/src/main/webapp/signup.jsp
index 2666991f..b833340f 100644
--- a/phoneblock/src/main/webapp/signup.jsp
+++ b/phoneblock/src/main/webapp/signup.jsp
@@ -1,108 +1,5 @@
-<!DOCTYPE html>
-<%@page import="de.haumacher.phoneblock.app.EMailVerificationServlet"%>
-<%@page import="de.haumacher.phoneblock.app.SettingsServlet"%>
-<%@page import="java.net.URLEncoder"%>
-<%@page import="de.haumacher.phoneblock.app.LoginServlet"%>
-<%@ page language="java" contentType="text/html; charset=UTF-8"	pageEncoding="UTF-8" session="false"%>
-<%@page import="de.haumacher.phoneblock.util.JspUtil"%>
-<%@page import="de.haumacher.phoneblock.app.oauth.PhoneBlockConfigFactory"%>
-<html>
 <%
-	request.setAttribute("title", "PhoneBlock Account erstellen");
-%>
-<head>
-<jsp:include page="head-content.jspf"></jsp:include>
-</head>
-
-<body>
-<jsp:include page="header.jspf"></jsp:include>
-
-<section class="section">
-<div class="content">
-
-<h1>Registrierung</h1>
-
-<p>
-	Um PhoneBlock in Deinem Internet-Router zu installieren, benötigst Du einen Benutzernamen und ein Passwort. Beides 
-	erhältst Du bei der Registrierung. In der <a href="<%= request.getContextPath() %>/setup.jsp">Installationsanleitung</a>
-	erfährst Du, wie Du anschließend die Blocklist abrufen und Anrufer mit diesen Telefonnummern blockieren kannst.  
-</p>
-
-</div>
-
-	<%
-		String location = LoginServlet.location(request, SettingsServlet.PATH);
-		String locationParam = LoginServlet.locationParam(location);
-		String locationParamFirst = LoginServlet.locationParamFirst(location);
-	%>
-
-<nav class="panel">
-	<p class="panel-heading">
-		<a href="<%=request.getContextPath()%>/oauth/login<%=locationParamFirst%>&force_client=<%=PhoneBlockConfigFactory.GOOGLE_CLIENT%>"><i class="fa-brands fa-google"></i> <span>Mit Google registrieren</span></a>
-	</p>
-</nav>
-
-<%
-	Object message = request.getAttribute("message");
-	String active = message != null ? "is-active" : "";
-%>
-<nav class="panel">
-	<p class="panel-heading"><a href="#registerForm" data-action="collapse"><i class="fas fa-envelope"></i> <span>Mit E-Mail registrieren</span></a></p>
-	<div id="registerForm" class="is-collapsible <%=active%>">
-		<form action="<%= request.getContextPath() %><%= EMailVerificationServlet.VERIFY_WEB%>" method="post" enctype="application/x-www-form-urlencoded">
-  		<div class="panel-block">
-  		<div class="content">
-			<%
-				if (location != null) {
-			%>
-		    <input type="hidden" name="<%=LoginServlet.LOCATION_ATTRIBUTE%>" value="<%= JspUtil.quote(location) %>">
-			<%
-				}
-			%>
-			<div class="field">
-			  <label class="label">E-Mail</label>
-			  <div class="control has-icons-left has-icons-right">
-			    <input name="email" class="input<%= message != null ? " is-danger" : "" %>" type="email" placeholder="Deine E-Mail-Adresse" value="<%= JspUtil.quote(request.getAttribute("email")) %>">
-			    <span class="icon is-small is-left">
-			      <i class="fas fa-envelope"></i>
-			    </span>
-<%
-				if (message != null) {
-%>
-				    <span class="icon is-small is-right">
-				      <i class="fas fa-exclamation-triangle"></i>
-				    </span>
-<%
-				}
-%>
-			  </div>
-<%
-			  	if (message != null) {
-%>
-					<p class="help is-danger">
-						<%= JspUtil.quote(request.getAttribute("message")) %>
-						<a href="<%=request.getContextPath()%>/signup.jsp<%=locationParamFirst%>">Nochmal probieren</a>.								
-					</p>
-<%
-			  	}
-%>
-			</div>		
-					
-			<div class="buttons is-right">
-		    	<button class="button is-link" type="submit">Registrieren</button>
-			</div>
-			
-			<p>
-				 Wenn Du schon einen PhoneBlock-Account hast, dann <a href="<%=request.getContextPath()%>/login.jsp<%=locationParamFirst%>">melde Dich an</a>! 
-			</p>
-		</div>
-		</div>
-		</form>
-	</div>
-</nav>
-
-</section>
-
-<jsp:include page="footer.jspf"></jsp:include>
-</body>
-</html>
\ No newline at end of file
+	// Page does no longer exist.
+	response.sendRedirect(request.getContextPath() + "/login.jsp");
+	return;
+%>
\ No newline at end of file
diff --git a/phoneblock/src/main/webapp/sitemap.jsp b/phoneblock/src/main/webapp/sitemap.jsp
index b792326c..88483071 100644
--- a/phoneblock/src/main/webapp/sitemap.jsp
+++ b/phoneblock/src/main/webapp/sitemap.jsp
@@ -71,7 +71,7 @@
    </url>
 
    <url>
-      <loc>https://phoneblock.net/phoneblock/signup.jsp</loc>
+      <loc>https://phoneblock.net/phoneblock/login.jsp</loc>
       <lastmod>${maven.build.timestamp}</lastmod>
       <changefreq>monthly</changefreq>
       <priority>0.5</priority>
diff --git a/phoneblock/src/main/webapp/support-banktransfer.jsp b/phoneblock/src/main/webapp/support-banktransfer.jsp
index 91e79f2e..510fbe07 100644
--- a/phoneblock/src/main/webapp/support-banktransfer.jsp
+++ b/phoneblock/src/main/webapp/support-banktransfer.jsp
@@ -20,7 +20,7 @@
 
 		<p>
 			Vielen Dank, dass Du Dich an den Kosten von PhoneBlock beteiligst. Wenn viele mitmachen, reicht ein kleiner Betrag reicht aus, z.B. 
-			<b>1€ pro Jahr</b> oder <b>0,01€ pro abgefangenem Spam-Anruf</b>, Du kannst die höhe Deines Beitrages aber selbst wählen.
+			<b>1€ pro Jahr</b> oder <b>0,01€ pro abgefangenem Spam-Anruf</b>, Du kannst die Höhe Deines Beitrages aber selbst wählen.
 		</p>
 		
 		<p>
@@ -28,10 +28,10 @@
 		</p>
 
 		<ul>
-			<li>Empfänger: <code id="receiver">${bank.receiver}</code> <a id="receiver_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></li>
-			<li>Kontonummer: <code id="account">${bank.account}</code> <a id="account_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></li>
-			<li>BIC: <code id="bic">${bank.bic}</code> <a id="bic_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></li>
-			<li>Verwendungszweck: <code id="purpose">PhoneBlock-<%= LoginFilter.getAuthenticatedUser(request.getSession()).substring(0, 13)%></code> <a id="purpose_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></li>
+			<li>Empfänger: <code id="receiver">${bank.receiver}</code><a id="receiver_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></li>
+			<li>Kontonummer: <code id="account">${bank.account}</code><a id="account_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></li>
+			<li>BIC: <code id="bic">${bank.bic}</code><a id="bic_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></li>
+			<li>Verwendungszweck: <code id="purpose">PhoneBlock-<%= LoginFilter.getAuthenticatedUser(request.getSession()).substring(0, 13)%></code><a id="purpose_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></a></li>
 		</ul>
 		
 		<p>
diff --git a/phoneblock/src/main/webapp/support.jsp b/phoneblock/src/main/webapp/support.jsp
index b0cc6761..8b15b088 100644
--- a/phoneblock/src/main/webapp/support.jsp
+++ b/phoneblock/src/main/webapp/support.jsp
@@ -53,7 +53,7 @@
 					</p>
 <% } else { %>
 					<p class="subtitle">
-						Bitte gibt <code id="purpose">PhoneBlock-<%= userName.substring(0, 13)%></code><spam id="purpose_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></spam> mit als Nachricht ein, damit ich die Zahlung zuordnen kann.
+						Bitte gibt <code id="purpose">PhoneBlock-<%= userName.substring(0, 13)%></code><span id="purpose_" title="In die Zwischenablage kopieren." href="#" class="copyToClipboard"><i class="fa-solid fa-copy"></i></span> mit als Nachricht ein, damit ich die Zahlung zuordnen kann.
 					</p>
 <% } %>					
 				</a>
diff --git a/phoneblock/src/test/java/de/haumacher/phoneblock/db/TestDB.java b/phoneblock/src/test/java/de/haumacher/phoneblock/db/TestDB.java
index ea26b91b..be4c5819 100644
--- a/phoneblock/src/test/java/de/haumacher/phoneblock/db/TestDB.java
+++ b/phoneblock/src/test/java/de/haumacher/phoneblock/db/TestDB.java
@@ -70,7 +70,7 @@ public void tearDown() throws Exception {
 	
 	@Test
 	void testAuthToken() {
-		_db.createUser("test", "test1", "user1", "User 1");
+		_db.createUser("user1", "User 1");
 
 		long time = 1000;
 		final long createTime = time;
@@ -264,8 +264,8 @@ void testDuplicateAdd() {
 	
 	@Test
 	void testUserManagement() throws IOException {
-		_db.addUser("none", "1", "foo@bar.com", "Mr. X", "123");
-		_db.addUser("none", "2", "baz@bar.com", "Mr. Y", "123");
+		_db.addUser("foo@bar.com", "Mr. X", "123");
+		_db.addUser("baz@bar.com", "Mr. Y", "123");
 		
 		assertEquals("foo@bar.com", _db.basicAuth(header("foo@bar.com", "123")));
         assertNull(_db.basicAuth(header("foo@bar.com", "321")));
@@ -446,7 +446,7 @@ protected void checkPhone(String phone, int votes, int cnt10, int votes10, int c
 	
 	@Test
 	void testRating() {
-		_db.createUser("domain", "ext-1", "user-1", "User 1");
+		_db.createUser("user-1", "User 1");
 		
 		long time = 1;