From 6dc6bf93eb6752cadf38ea2fb43321ba048ab578 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Mon, 4 Jul 2016 14:46:01 +0300
Subject: [PATCH] =?UTF-8?q?1379:=20=D0=AD=D1=82=D0=B0=D0=BF=20=E2=84=964?=
 =?UTF-8?q?=20-=20=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20404=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8F=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D0=BA=D0=B0=20URL=20=D0=BF=D0=BE=20=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=B4=20(=D0=B5=D1=81=D0=BB=D0=B8=20=D1=82=D0=B0=D0=BC=20?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D1=86=D0=B8=D1=84=D1=80?=
 =?UTF-8?q?=D1=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 accounts/forms.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/accounts/forms.py b/accounts/forms.py
index b3e20fdf..c7e3443d 100644
--- a/accounts/forms.py
+++ b/accounts/forms.py
@@ -248,10 +248,11 @@ class RegistrationCompleteForm(forms.ModelForm):
 
         try:
             User.objects.get(url=url)
-            raise forms.ValidationError(_(u'Пользователь с таким url уже существует'))
-        except User.DoesNotExist:
+            User.objects.get(id=int(url))
+        except (User.DoesNotExist, ValueError, ):
             return url
-
+        else:
+            raise forms.ValidationError(_(u'Пользователь с таким url уже существует'))
 
 
 class SocialRegistrationCompleteForm(RegistrationCompleteForm):