diff --git a/templates/skin/developer-jquery/block.streamConfig.tpl b/templates/skin/developer-jquery/block.streamConfig.tpl
index 9ea1bc2a..37f75f39 100644
--- a/templates/skin/developer-jquery/block.streamConfig.tpl
+++ b/templates/skin/developer-jquery/block.streamConfig.tpl
@@ -41,21 +41,20 @@
 	<div class="stream-settings-userlist">
 		<p><input type="text" id="stream_users_complete" autocomplete="off" />
 		<a href="javascript:ls.stream.appendUser()">{$aLang.stream_block_config_append}</a></p>
-		{if count($aStreamSubscribedUsers)}
-                        <ul id="userfeed_block_users_list">
-			
-				{foreach from=$aStreamSubscribedUsers item=oUser}
-					{assign var=iUserId value=$oUser->getId()}
-					{if !isset($aStreamFriends.$iUserId)}
-						<li><input class="streamUserCheckbox input-checkbox"
-									type="checkbox"
-									id="strm_u_{$iUserId}"
-									checked="checked"
-									onClick="if ($(this).attr('checked')) { ls.stream.subscribe({$iUserId}) } else { ls.stream.unsubscribe({$iUserId}) } " />
-							<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
-						</li>
-					{/if}
-				{/foreach}
+				{if count($aStreamSubscribedUsers)}
+                        <ul id="stream_block_users_list">
+						{foreach from=$aStreamSubscribedUsers item=oUser}
+							{assign var=iUserId value=$oUser->getId()}
+							{if !isset($aStreamFriends.$iUserId)}
+								<li><input class="streamUserCheckbox input-checkbox"
+											type="checkbox"
+											id="strm_u_{$iUserId}"
+											checked="checked"
+											onClick="if ($(this).attr('checked')) { ls.stream.subscribe({$iUserId}) } else { ls.stream.unsubscribe({$iUserId}) } " />
+									<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
+								</li>
+							{/if}
+						{/foreach}
                         </ul>
                 {else}
                     <ul id="stream_block_users_list"></ul>
diff --git a/templates/skin/developer-jquery/js/stream.js b/templates/skin/developer-jquery/js/stream.js
index ee0ff1d2..700cbf9b 100644
--- a/templates/skin/developer-jquery/js/stream.js
+++ b/templates/skin/developer-jquery/js/stream.js
@@ -41,7 +41,7 @@ ls.stream =( function ($) {
                         ls.msg.notice(data.sMsgTitle,data.sMsg);
                     }
                 } else {
-                    var liElement='<li><input type="checkbox" class="streamUserCheckbox" id="usf_u_'+data.uid+'" checked="checked" onClick="if ($(this).get(\'checked\')) {ls.stream.subscribe(\'users\','+data.uid+')} else {ls.stream.unsubscribe(\'users\','+data.uid+')}" /><a href="'+data.user_web_path+'">'+data.user_login+'</a></li>';
+                    var liElement='<li><input type="checkbox" class="streamUserCheckbox input-checkbox" id="usf_u_'+data.uid+'" checked="checked" onClick="if ($(this).get(\'checked\')) {ls.stream.subscribe(\'users\','+data.uid+')} else {ls.stream.unsubscribe(\'users\','+data.uid+')}" /> <a href="'+data.user_web_path+'">'+data.user_login+'</a></li>';
                     $('#stream_block_users_list').append(liElement);
                     ls.msg.notice(data.sMsgTitle,data.sMsg);
                 }
diff --git a/templates/skin/new-jquery/block.streamConfig.tpl b/templates/skin/new-jquery/block.streamConfig.tpl
index 9ea1bc2a..37f75f39 100644
--- a/templates/skin/new-jquery/block.streamConfig.tpl
+++ b/templates/skin/new-jquery/block.streamConfig.tpl
@@ -41,21 +41,20 @@
 	<div class="stream-settings-userlist">
 		<p><input type="text" id="stream_users_complete" autocomplete="off" />
 		<a href="javascript:ls.stream.appendUser()">{$aLang.stream_block_config_append}</a></p>
-		{if count($aStreamSubscribedUsers)}
-                        <ul id="userfeed_block_users_list">
-			
-				{foreach from=$aStreamSubscribedUsers item=oUser}
-					{assign var=iUserId value=$oUser->getId()}
-					{if !isset($aStreamFriends.$iUserId)}
-						<li><input class="streamUserCheckbox input-checkbox"
-									type="checkbox"
-									id="strm_u_{$iUserId}"
-									checked="checked"
-									onClick="if ($(this).attr('checked')) { ls.stream.subscribe({$iUserId}) } else { ls.stream.unsubscribe({$iUserId}) } " />
-							<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
-						</li>
-					{/if}
-				{/foreach}
+				{if count($aStreamSubscribedUsers)}
+                        <ul id="stream_block_users_list">
+						{foreach from=$aStreamSubscribedUsers item=oUser}
+							{assign var=iUserId value=$oUser->getId()}
+							{if !isset($aStreamFriends.$iUserId)}
+								<li><input class="streamUserCheckbox input-checkbox"
+											type="checkbox"
+											id="strm_u_{$iUserId}"
+											checked="checked"
+											onClick="if ($(this).attr('checked')) { ls.stream.subscribe({$iUserId}) } else { ls.stream.unsubscribe({$iUserId}) } " />
+									<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
+								</li>
+							{/if}
+						{/foreach}
                         </ul>
                 {else}
                     <ul id="stream_block_users_list"></ul>
diff --git a/templates/skin/new-jquery/js/stream.js b/templates/skin/new-jquery/js/stream.js
index ee0ff1d2..700cbf9b 100644
--- a/templates/skin/new-jquery/js/stream.js
+++ b/templates/skin/new-jquery/js/stream.js
@@ -41,7 +41,7 @@ ls.stream =( function ($) {
                         ls.msg.notice(data.sMsgTitle,data.sMsg);
                     }
                 } else {
-                    var liElement='<li><input type="checkbox" class="streamUserCheckbox" id="usf_u_'+data.uid+'" checked="checked" onClick="if ($(this).get(\'checked\')) {ls.stream.subscribe(\'users\','+data.uid+')} else {ls.stream.unsubscribe(\'users\','+data.uid+')}" /><a href="'+data.user_web_path+'">'+data.user_login+'</a></li>';
+                    var liElement='<li><input type="checkbox" class="streamUserCheckbox input-checkbox" id="usf_u_'+data.uid+'" checked="checked" onClick="if ($(this).get(\'checked\')) {ls.stream.subscribe(\'users\','+data.uid+')} else {ls.stream.unsubscribe(\'users\','+data.uid+')}" /> <a href="'+data.user_web_path+'">'+data.user_login+'</a></li>';
                     $('#stream_block_users_list').append(liElement);
                     ls.msg.notice(data.sMsgTitle,data.sMsg);
                 }