Fix for Bug412876

Change-Id: Ib1f074c6ab58287adc46d293d4eaf09468fb91f1
Signed-off-by: Francois Chouinard <fchouinard@gmail.com>
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/PreferenceConstants.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/PreferenceConstants.java
index e2cb14c..b0154e8 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/PreferenceConstants.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/PreferenceConstants.java
@@ -254,9 +254,9 @@
 					store.setDefault(PreferenceConstants.P_USER_EMAIL, userInfos.get(0).getEmail());
 				}
 			} catch (NamingException e) {
-				R4EUIPlugin.Ftracer.traceError("Exception: " + e.toString() + " (" + e.getMessage() + ")");
+				R4EUIPlugin.Ftracer.traceError("Exception: " + e.toString() + " (" + e.getMessage() + ")"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
 			} catch (IOException e) {
-				R4EUIPlugin.Ftracer.traceWarning("Exception: " + e.toString() + " (" + e.getMessage() + ")");
+				R4EUIPlugin.Ftracer.traceWarning("Exception: " + e.toString() + " (" + e.getMessage() + ")"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
 			}
 		}
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/PreferenceInitializer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/PreferenceInitializer.java
index 73476ac..e340ac7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/PreferenceInitializer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/PreferenceInitializer.java
@@ -46,8 +46,12 @@
 		final IPreferenceStore store = R4EUIPlugin.getDefault().getPreferenceStore();
 
 		//Set default User ID if none already stored in preferences
-		store.setDefault(PreferenceConstants.P_USER_ID, System.getProperty("user.name").toLowerCase());
+		store.setDefault(PreferenceConstants.P_USER_ID, System.getProperty("user.name").toLowerCase()); //$NON-NLS-1$
 		PreferenceConstants.setUserEmailDefaultPreferences();
+		if (store.getDefaultString(PreferenceConstants.P_USER_EMAIL) == "") { //$NON-NLS-1$
+			store.setDefault(PreferenceConstants.P_USER_EMAIL, store.getDefaultString(PreferenceConstants.P_USER_ID)
+					+ "@localhost.com"); //$NON-NLS-1$
+		}
 		store.setDefault(PreferenceConstants.P_USE_DELTAS, true);
 		store.setDefault(PreferenceConstants.P_REVIEWS_COMPLETED_FILTER, true);
 		store.setDefault(PreferenceConstants.P_HIDE_DELTAS_FILTER, true);