diff --git a/checkin_notes b/checkin_notes
index 1795cdc39f..5c5aceb81d 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5068,3 +5068,9 @@ Rom    4 June 2009
         
     clientgui/
         browser.cpp, .h
+
+Rom    4 June 2009
+    - MGR: Add some basic validation for account manager cookie detection.
+        
+    clientgui/
+        browser.cpp
diff --git a/clientgui/browser.cpp b/clientgui/browser.cpp
index beff918f4c..8bae95fea2 100644
--- a/clientgui/browser.cpp
+++ b/clientgui/browser.cpp
@@ -699,8 +699,9 @@ bool detect_account_manager_credentials(
          detect_cookie_firefox_2(project_url, strCookiePasswordHash, password_hash) ) goto END;
 
 END:
-    // TODO: validation
-    retval = true;
+    if (!login.empty() && !password_hash.empty()) {
+        retval = true;
+    }
 
     return retval;
 }