diff --git a/app/controllers/wktime_controller.rb b/app/controllers/wktime_controller.rb
index 6c28396b..f5713184 100644
--- a/app/controllers/wktime_controller.rb
+++ b/app/controllers/wktime_controller.rb
@@ -134,15 +134,15 @@ def edit
 		findWkTE(@startday)
 
 		# Getting allowed Project members
-		@users = []
-		members = []
 		projects = (@manage_projects || []).pluck(:id)
 		projects.concat((@manage_others_log || []).pluck(:id))
-		projects.each do |projID|
-			project = Project.find(projID)
-			project.members.each{|member| members << [member.user.name, member.user.id] }
-		end
-		members.each {|userID| @users << userID if userID && !@users.include?(userID) }
+
+		@users = User.includes(:members)
+			.joins("join members on users.id = members.user_id")
+			.where("members.project_id": projects)
+			.distinct
+			.map{|user| [user.name, user.id] }
+
 		if getSheetView == 'W'
 			getUserwkStatuses
 			getApproverPermProj