diff --git a/dss/settings.py b/dss/settings.py
index 51c9578..e697212 100644
--- a/dss/settings.py
+++ b/dss/settings.py
@@ -119,7 +119,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.gzip.GZipMiddleware',
     'spa.middleware.uploadify.SWFUploadMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
     )
 
 WSGI_APPLICATION = 'dss.wsgi.application'
@@ -139,7 +139,7 @@ INSTALLED_APPS = (
     'django_extensions',
     'compressor',
     'djcelery',
-    'debug_toolbar',
+    #'debug_toolbar',
     'crispy_forms',
     'sorl.thumbnail',
 #'south', # the only requirement for SCT
diff --git a/spa/models/UserProfile.py b/spa/models/UserProfile.py
index be26f20..68cd6d0 100644
--- a/spa/models/UserProfile.py
+++ b/spa/models/UserProfile.py
@@ -11,7 +11,7 @@ from core.utils.file import generate_save_file_name
 from dss import settings
 from spa.models._BaseModel import _BaseModel
 def avatar_name(instance, filename):
-    return generate_save_file_name('avatars', filename)
+    return generate_save_file_name(str(instance.id), 'avatars', filename)
 
 class UserProfile(_BaseModel):
     class Meta: