diff --git a/app/MyApp/app/views/CourseMembers.js b/app/MyApp/app/views/CourseMembers.js
index 45e6c6dfe..90d79846b 100644
--- a/app/MyApp/app/views/CourseMembers.js
+++ b/app/MyApp/app/views/CourseMembers.js
@@ -82,11 +82,11 @@ $(function () {
                                     attchmentURL = attchmentURL + _.keys(mems.get('_attachments'))[0]
                                     src = attchmentURL
                                 }
-                                if(config.models[0].attributes.rows[0].doc.type == 'nation' && mems.get("community") == 'nationbell' || config.models[0].attributes.rows[0].doc.type == 'community'){
-                                    viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td><input type="checkbox" name="courseMember" value="' + mail + '">'+App.languageDict.attributes.Send_Email+'</td>'
-                                } else {
-                                    viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td></td>'
-                                }
+                                viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td>'+ mems.get('community') +'</td>';
+                                if(mems.get("community")==config.models[0].attributes.rows[0].doc.code)
+                                    viewtext += '<td><input type="checkbox" name="courseMember" value="' + mail + '">'+App.languageDict.attributes.Send_Email+'</td><td></td>';
+                                else
+                                    viewtext += '<td></td><td></td>';
                                 var loggedIn = new App.Models.Member({
                                     "_id": $.cookie('Member._id')
                                 })
@@ -183,7 +183,7 @@ $(function () {
                                         attchmentURL = attchmentURL + _.keys(mems.get('_attachments'))[0]
                                         src = attchmentURL
                                     }
-                                    if(config.models[0].attributes.rows[0].doc.type == 'nation' && mems.get("community") == 'nationbell'){
+                                    if(config.models[0].attributes.rows[0].doc.code == mems.get("community")){
                                         viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td><input type="checkbox" name="courseMember" value="' + mail + '">'+App.languageDict.attributes.Send_Email+'</td>'
                                     } else{
                                         viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td></td>'
diff --git a/tests/report_test.js b/tests/report_test.js
index 9bc091d9c..b56a1f80a 100644
--- a/tests/report_test.js
+++ b/tests/report_test.js
@@ -75,7 +75,7 @@ Scenario('Test for Add Report', (I) => {
 	I.waitForVisible(ActReport);
 	I.waitForEnabled(ActReport);
 	I.click(ActReport);
-	I.wait(5)
+	I.wait(10)
 	I.seeInCurrentUrl('http://127.0.0.1:5981/apps/_design/bell/MyApp/index.html#logreports');
 	I.wait(2);
 	I.waitForVisible(dateVis);