diff --git a/app/eve_api/forms.py b/app/eve_api/forms.py
index 7c12f11..744acbc 100644
--- a/app/eve_api/forms.py
+++ b/app/eve_api/forms.py
@@ -51,7 +51,7 @@ class EveAPIForm(forms.ModelForm):
                 raise forms.ValidationError("You cannot change your API User ID")
         else:
             try:
-                eaccount = EVEAccount.objects.get(api_user_id=self.cleaned_data['api_user_id'])
+                eaccount = EVEAccount.objects.get(api_user_id=self.cleaned_data['api_user_id'], user__isnull=False)
             except EVEAccount.DoesNotExist:
                 pass
             else:
diff --git a/app/eve_api/tasks/account.py b/app/eve_api/tasks/account.py
index 7cfb2f8..0c1d0a4 100644
--- a/app/eve_api/tasks/account.py
+++ b/app/eve_api/tasks/account.py
@@ -161,8 +161,8 @@ def import_apikey_func(api_userid, api_key, user=None, force_cache=False, log=lo
         if not 'error' in doc:
             if not account:
                 account, created = EVEAccount.objects.get_or_create(pk=api_userid)
-                if user:
-                    account.user = User.objects.get(id=user)
+            if user and not account.user:
+                account.user = User.objects.get(id=user)
             if not account.api_key == api_key:
                 account.api_key = api_key
             account.api_status = API_STATUS_OK