X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditProfileFieldPage.java;h=bbc6d6b00d8f2df0299a14b9fa4d8ea09d81d6dd;hb=14bcfdd073d7ae75ae77bc112e38b29aee243411;hp=e5bee788cc4f1ff034336bea90df0669c28c48da;hpb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java b/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
index e5bee78..bbc6d6b 100644
--- a/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
@@ -75,12 +75,15 @@ public class EditProfileFieldPage extends SoneTemplatePage {
 			}
 			String name = request.getHttpRequest().getPartAsStringFailsafe("name", 256);
 			Field existingField = profile.getFieldByName(name);
-			if ((existingField == null) || (existingField.equals(field))) {
-				field.setName(name);
-				currentSone.setProfile(profile);
+			if ((existingField != null) && (!field.equals(existingField))) {
+				templateContext.set("duplicateFieldName", true);
+			} else {
+				if (!name.equals(field.getName())) {
+					field.setName(name);
+					currentSone.setProfile(profile);
+				}
 				throw new RedirectException("editProfile.html#profile-fields");
 			}
-			templateContext.set("duplicateFieldName", true);
 		}
 
 		/* store current values in template. */