diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
index 6545a586c5..35e3aa896b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
@@ -671,7 +671,10 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 			.append(m_reportEngine.getRowCount());
 		statusBar.setStatusLine(sb.toString());
 		//
-		bWizard.setDisabled( (m_reportEngine.getPrintFormat() == null || m_reportEngine.getPrintFormat().getAD_Client_ID() == 0) );
+		bWizard.setDisabled(
+				(   m_reportEngine.getPrintFormat() == null
+				 || (m_reportEngine.getPrintFormat().getAD_Client_ID() == 0 && Env.getAD_Client_ID(Env.getCtx()) != 0)
+				 || m_reportEngine.getPrintFormat().isForm()));
 	}	//	revalidate
 
 	/**