diff --git a/src/main/webapp/templates/forecastConfigurationList.ftl b/src/main/webapp/templates/forecastConfigurationList.ftl
index 2c3b22995206a9fbd05c424ea387be2d4667473d..46a9a094177ff09a8e53026d715ac67eca039c95 100755
--- a/src/main/webapp/templates/forecastConfigurationList.ftl
+++ b/src/main/webapp/templates/forecastConfigurationList.ftl
@@ -69,6 +69,7 @@
 		</div>
 	</div>
 	<button type="button" class="btn btn-default" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1&multipleNew=true'">${i18nBundle.addMultipleNew}</button>
+        </#if>
         <h2>${i18nBundle.privateForecasts}</h2>
         <div class="table-responsive">
 	<table class="table table-striped">
@@ -98,6 +99,7 @@
 		</tbody>
         </table>
         </div>	
+        <#if user.isSuperUser() || user.isOrganizationAdmin()>
 	<h2>${i18nBundle.publicForecasts}</h2>
         <div class="table-responsive">
 	<table class="table table-striped">
@@ -127,7 +129,7 @@
 		</tbody>
         </table>
         </div>
-        </#if>
+        </#if> 
         
         <#if user.isSuperUser() >
         <h2>${i18nBundle.privateForecastsForOtherUser}</h2>
@@ -155,7 +157,7 @@
 				<th>${i18nBundle.dateEnd}</th>
 			</thead>
 			<tbody>
-			<#list privateForecastConfigurations as forecastConfiguration>
+			<#list privateForecastConfigurationsForOtherUser as forecastConfiguration>
 			    <tr style="cursor: pointer;" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=${forecastConfiguration.forecastConfigurationId}';">
 				<td>
 					<#if i18nBundle.containsKey(forecastConfiguration.modelId)>