diff --git a/maloja/database/sqldb.py b/maloja/database/sqldb.py
index cfd9d96..32860bd 100644
--- a/maloja/database/sqldb.py
+++ b/maloja/database/sqldb.py
@@ -363,8 +363,16 @@ def get_artist_id(artistname,create_new=True,dbconn=None):
 
 @connection_provider
 def edit_artist(id,artistupdatedict,dbconn=None):
+
+	artist = get_artist(id)
+	changedartist = artistupdatedict # well
+
 	dbentry = artist_dict_to_db(artistupdatedict)
 
+	existing_artist = get_artist_id(changedartist,create_new=False,dbconn=dbconn)
+	if existing_artist:
+		raise exc.ArtistExists(changedartist)
+
 	op = DB['artists'].update().where(
 		DB['artists'].c.id==id
 	).values(
diff --git a/maloja/web/static/js/edit.js b/maloja/web/static/js/edit.js
index 5ffecf6..b108fbb 100644
--- a/maloja/web/static/js/edit.js
+++ b/maloja/web/static/js/edit.js
@@ -92,6 +92,7 @@ function doneEditing() {
 			}
 			else {
 				notifyCallback(req);
+				namefield.textContent = entity_name;
 			}
 		};