diff --git a/supysonic/frontend/user.py b/supysonic/frontend/user.py
index 86d237d..bd349c8 100644
--- a/supysonic/frontend/user.py
+++ b/supysonic/frontend/user.py
@@ -192,7 +192,7 @@ def add_user():
 
 @app.route('/user/del/<uid>')
 def del_user(uid):
-	status = UserManager.delete(store, uuid.UUID(uid))
+	status = UserManager.delete(store, uid)
 	if status == UserManager.SUCCESS:
 		flash('Deleted user')
 	else:
diff --git a/supysonic/managers/user.py b/supysonic/managers/user.py
index 1840520..d4704b5 100644
--- a/supysonic/managers/user.py
+++ b/supysonic/managers/user.py
@@ -70,14 +70,14 @@ class UserManager:
         if status != UserManager.SUCCESS:
             return status
 
-        store.find(StarredFolder, StarredFolder.user_id == uid).remove()
-        store.find(StarredArtist, StarredArtist.user_id == uid).remove()
-        store.find(StarredAlbum,  StarredAlbum.user_id  == uid).remove()
-        store.find(StarredTrack,  StarredTrack.user_id  == uid).remove()
-        store.find(RatingFolder, RatingFolder.user_id == uid).remove()
-        store.find(RatingTrack,  RatingTrack.user_id  == uid).remove()
-        store.find(ChatMessage, ChatMessage.user_id == uid).remove()
-        for playlist in store.find(Playlist, Playlist.user_id == uid):
+        store.find(StarredFolder, StarredFolder.user_id == user.id).remove()
+        store.find(StarredArtist, StarredArtist.user_id == user.id).remove()
+        store.find(StarredAlbum,  StarredAlbum.user_id  == user.id).remove()
+        store.find(StarredTrack,  StarredTrack.user_id  == user.id).remove()
+        store.find(RatingFolder, RatingFolder.user_id == user.id).remove()
+        store.find(RatingTrack,  RatingTrack.user_id  == user.id).remove()
+        store.find(ChatMessage, ChatMessage.user_id == user.id).remove()
+        for playlist in store.find(Playlist, Playlist.user_id == user.id):
             playlist.tracks.clear()
             store.remove(playlist)