diff --git a/ChangeLog b/ChangeLog
index 429a2362b..06348ca15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-23  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* Tools/SOGoToolUserPreferences.m (-run): fixed possible out of
+	bound exception when parsing arguments.
+
 2011-12-22  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxTaskEditor.m (-takeValuesFromRequest:inContext:): remove alarms
diff --git a/Tools/SOGoToolUserPreferences.m b/Tools/SOGoToolUserPreferences.m
index 6a2e1db88..6aaf3867a 100644
--- a/Tools/SOGoToolUserPreferences.m
+++ b/Tools/SOGoToolUserPreferences.m
@@ -192,10 +192,10 @@ typedef enum
                     }
 
                   key = [arguments objectAtIndex: i++];
-                  value = [arguments objectAtIndex: i++];
 
 		  if (max > i)
                     {
+                      value = [arguments objectAtIndex: i++];
                       if ([value caseInsensitiveCompare: @"-f"] == NSOrderedSame)
                         {
                           if (max > i)