diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
index f734326303..4bd07f8d6a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
@@ -164,6 +164,10 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
 		
 		btnSwitchTimeZone = (Button) component.getFellow("btnSwitchTimeZone");
 		btnSwitchTimeZone.addEventListener(Events.ON_CLICK, this);
+		String alternateTimeZone = MSysConfig.getValue(MSysConfig.CALENDAR_ALTERNATE_TIMEZONE, "Pacific Time=PST", Env.getAD_Client_ID(Env.getCtx()));
+		if (Util.isEmpty(alternateTimeZone, true))
+			btnSwitchTimeZone.setVisible(false);
+
 		
 		lblDate = (Label) component.getFellow("lblDate");
 		lblDate.addEventListener(Events.ON_CREATE, this);
@@ -528,4 +532,4 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
 		updateDateLabel();
 		FDOW.setVisible("month".equals(calendars.getMold()) || calendars.getDays() == 7);
 	}
-}
\ No newline at end of file
+}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
index 93da26237f..2d2dfb1c24 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
@@ -452,7 +452,8 @@ public class DPCalendar extends DashboardPanel implements EventListener<Event>,
 			}
 		} else {
 			desktop = new WeakReference<Desktop>(getDesktop());
-			desktop.get().addListener(listener);
+			if (desktop.get() != null)
+				desktop.get().addListener(listener);
 		}
 		
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
index aab8a94a67..10a980be36 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
@@ -18,6 +18,7 @@ import java.util.Calendar;
 import java.util.Properties;
 import java.util.logging.Level;
 
+import org.adempiere.exceptions.AdempiereException;
 import org.adempiere.webui.component.Borderlayout;
 import org.adempiere.webui.component.Column;
 import org.adempiere.webui.component.Columns;
@@ -152,8 +153,14 @@ public class RequestWindow extends Window implements EventListener<Event> {
 			if(confidentialField.getComponent().getItemCount() > 1)
 				confidentialField.setValue(confidentialField.getComponent().getItemAtIndex(1).getValue());
 		
-		columnID = MColumn.getColumn_ID(MRequest.Table_Name, MRequest.COLUMNNAME_SalesRep_ID);
-		lookup = MLookupFactory.get(ctx, 0, 0, columnID, DisplayType.TableDir);
+		MColumn columnSR = MColumn.get(Env.getCtx(), MRequest.Table_Name, MRequest.COLUMNNAME_SalesRep_ID);
+		try {
+			lookup = MLookupFactory.get(Env.getCtx(), 0, columnSR.getAD_Column_ID(), DisplayType.TableDir,
+					Env.getLanguage(Env.getCtx()), columnSR.getColumnName(), columnSR.getAD_Reference_Value_ID(), false,
+					"(EXISTS (SELECT * FROM C_BPartner bp WHERE AD_User.C_BPartner_ID=bp.C_BPartner_ID AND (bp.IsEmployee='Y' OR bp.IsSalesRep='Y')) OR AD_User_ID=@#AD_User_ID@)");
+		} catch (Exception e) {
+			throw new AdempiereException(e);
+		}
 		salesRepField = new WTableDirEditor("SalesRep_ID", true, false, true, lookup);
 		salesRepField.setValue(Env.getContextAsInt(ctx, "SalesRep_ID"));
 		if(salesRepField.getValue() == null || salesRepField.getValue().equals(0))