Index: flickr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flickr/flickr.module,v
retrieving revision 1.29
diff -u -r1.29 flickr.module
--- flickr.module	15 Feb 2007 02:54:46 -0000	1.29
+++ flickr.module	10 Apr 2007 21:11:12 -0000
@@ -211,15 +211,15 @@
       if (($nsid = flickr_user_find_by_identifier($edit['flickr_identifier'])) === FALSE) {
         form_set_error('flickr_identifier', t('%ident is not a valid Flickr username, email, or NSID.', array('%ident' => $edit['flickr_identifier'])));
       }
-      else {
-        $account->flickr['nsid'] = $nsid;
-      }
     }
   }
   elseif ($op == 'insert' || $op == 'update') {
     if (isset($edit['flickr_identifier'])) {
       db_query('DELETE FROM {flickr_users} WHERE uid=%d', $account->uid);
       if (!empty($edit['flickr_identifier'])) {
+        if (($nsid = flickr_user_find_by_identifier($edit['flickr_identifier'])) !== FALSE) {
+          $account->flickr['nsid'] = $nsid;
+        }
         db_query('INSERT INTO {flickr_users} (uid, nsid, identifier) VALUES (%d, \'%s\', \'%s\')', $account->uid, $account->flickr['nsid'], $edit['flickr_identifier']);
       }
       else {