--- flickr.old.module	2008-04-02 21:09:05.000000000 +0100
+++ flickr.module	2008-11-04 15:38:38.000000000 +0000
@@ -66,7 +66,8 @@ function flickr_menu() {
     'description' => 'Flickr photos of default user id.',
   );
   $items['flickr/%user'] = array(
-    'title' => 'Flickr photos',
+    'title callback' => 'flickr_page_title',
+    'title arguments' => array(1),
     'type' => MENU_CALLBACK,
     'page callback' => 'flickr_photos',
     'page arguments' => array(1),
@@ -105,7 +106,7 @@ function flickr_photos_access($account) 
  * Add an extra field for the user to enter his flickr identifier.
  */
 function flickr_user($op, &$edit, &$account, $category = NULL) {
-  if ($op == 'form') {
+  if ($op == 'form' && (user_access('view own flickr photos') || user_access('administer flickr'))) {
     if ($category == 'account') {
       $user = user_load(array('uid' => $account->uid));
       $form['flickr'] = array(
@@ -239,3 +240,6 @@ function theme_flickr_photoset($ps, $own
   return l($img, $photo_url, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE));
 }
 
+function flickr_page_title($user) {
+	return 'Flickr photos - '. $user->name;
+}