Index: VKontakte.pm
===================================================================
--- VKontakte.pm	(revision 311)
+++ VKontakte.pm	(revision 312)
@@ -149,7 +149,8 @@
 		my $user;
 		if ( $state->{users}->use_credentials ) {
 			$user = $keeper->{users}->get_profile( vkontakte => $user_info->{uid} );
-		} else {
+		}
+		unless ( ref $user ) {
 			$user = $keeper->{users}->get_profile( login => 'vkontakte:'.$user_info->{uid} );
 		}
 		unless ( ref $user ) {
@@ -172,12 +173,6 @@
 			}
 
 			$user->store;
-			if ( $state->{users}->use_credentials ) {
-				$user->create_credential(
-					vkontakte => $user_info->{uid},
-					avatar	=> $user_info->{photo_big},
-				);
-			}
 		} else {
 			my ($prop_ava) = grep { $_->{attr} eq 'avatar' && $_->{type} eq 'image' } $user->structure;
 			if ( ref $prop_ava ) {
@@ -190,6 +185,12 @@
 				}
 			}
 		}
+		if ( $state->{users}->use_credentials ) {
+			$user->create_credential(
+				vkontakte => $user_info->{uid},
+				avatar	=> $user_info->{photo_big},
+			);
+		}
 		my %data = (
 			id	=> $user->id,
 			name	=> $name,