diff --git a/patches/add_closing_labels.diff b/patches/add_closing_labels.diff
new file mode 100644
index 0000000000000000000000000000000000000000..eca2f831842924fa623dc19cd9a33d43fb680209
--- /dev/null
+++ b/patches/add_closing_labels.diff
@@ -0,0 +1,31 @@
+Index: views/default/forms/forums/edittopic.php
+===================================================================
+--- views/default/forms/forums/edittopic.php	(revision 1182)
++++ views/default/forms/forums/edittopic.php	(working copy)
+@@ -61,6 +61,7 @@
+ 													));
+ 			
+ 			?>
++			</label>
+ 		</p>
+ 		
+ 		<!-- topic message input -->
+@@ -104,4 +105,4 @@
+ 			<input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
+ 		</p>
+ 	
+-	</form>
+\ No newline at end of file
++	</form>
+Index: views/default/forms/forums/addtopic.php
+===================================================================
+--- views/default/forms/forums/addtopic.php	(revision 1182)
++++ views/default/forms/forums/addtopic.php	(working copy)
+@@ -56,6 +56,7 @@
+ 													));
+ 			
+ 			?>
++			</label>
+ 		</p>
+ 		
+ 		<!-- topic message input -->
diff --git a/setup.sh b/setup.sh
index 85f06154a058fef7e9657ddd6922393582b9b613..6f65b12192052997e14e8cc1528521d108c496fd 100755
--- a/setup.sh
+++ b/setup.sh
@@ -6,5 +6,6 @@ mkdir elgg_data
 #Do patches
 cd elgg
 patch -p0 < ../patches/lowercase_post.diff
-
+cd mod/groups
+patch -p0 < ../../../patches/add_closing_labels.diff