Index: assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
===================================================================
--- assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(revision 314073)
+++ assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(working copy)
@@ -9936,7 +9936,7 @@
 			while (submissions.hasNext())
 			{
 				AssignmentSubmission s = (AssignmentSubmission) submissions.next();
-				if (s.getGraded())
+				if (s.getGraded()||(s.getGrade()!=null&&!"".equals(s.getGrade())))
 				{
 					String sRef = s.getReference();
 					AssignmentSubmissionEdit sEdit = editSubmission(sRef, "doRelease_grades", state);
@@ -9952,6 +9952,7 @@
 							if (grade != null && !"".equals(grade))
 							{
 								sEdit.setGradeReleased(true);
+								if(!s.getGraded())sEdit.setGraded(true);
 							}
 						}
 						else