diff --git a/questtypes/dragndrop/DragndropQuesttypeController.inc b/questtypes/dragndrop/DragndropQuesttypeController.inc
index 1007a1f8..85b96844 100644
--- a/questtypes/dragndrop/DragndropQuesttypeController.inc
+++ b/questtypes/dragndrop/DragndropQuesttypeController.inc
@@ -123,14 +123,18 @@
 			
 			// Get Drops
 			$drops = $this->Dragndrop->getDrops($dndField['quest_id']);
-			foreach($drops as &$drop)
+			
+			// Get Character answers
+			if($this->request->getGetParam('show-answer') == 'true')
 			{
-				// Get saved user answer
-				$drop['useranswer'] = $this->Dragndrop->getCharacterSubmission($drop['id'], $character['id']);
-				if(!is_null($drop['useranswer']))
+				foreach($drops as &$drop)
 				{
-					$drop['useranswer'] = $drags[$drop['useranswer']];
-					unset($drags[$drop['useranswer']['id']]);
+					$drop['answer'] = $this->Dragndrop->getCharacterSubmission($drop['id'], $character['id']);
+					if(!is_null($drop['answer']))
+					{
+						$drop['answer'] = $drags[$drop['answer']];
+						unset($drags[$drop['answer']['id']]);
+					}
 				}
 			}
 			
@@ -169,14 +173,15 @@
 			
 			// Get Drops
 			$drops = $this->Dragndrop->getDrops($dndField['quest_id']);
+			
+			// Get Character answers
 			foreach($drops as &$drop)
 			{
-				// Get saved user answer
-				$drop['useranswer'] = $this->Dragndrop->getCharacterSubmission($drop['id'], $character['id']);
-				if(!is_null($drop['useranswer']))
+				$drop['answer'] = $this->Dragndrop->getCharacterSubmission($drop['id'], $character['id']);
+				if(!is_null($drop['answer']))
 				{
-					$drop['useranswer'] = $drags[$drop['useranswer']];
-					unset($drags[$drop['useranswer']['id']]);
+					$drop['answer'] = $drags[$drop['answer']];
+					unset($drags[$drop['answer']['id']]);
 				}
 			}
 			
diff --git a/questtypes/dragndrop/html/quest.tpl b/questtypes/dragndrop/html/quest.tpl
index 28d208b2..bf8dcfe2 100644
--- a/questtypes/dragndrop/html/quest.tpl
+++ b/questtypes/dragndrop/html/quest.tpl
@@ -1,8 +1,8 @@
 <form method="post">
 	<div id="dropZone" style="width:<?=$field['width']?>px; height:<?=$field['height']?>px; background-image:url('<?=$linker->link(array('media','index',$seminary['url'],$field['media']['url']))?>')">
 		<?php foreach($drops as &$drop) : ?>
-		<div id="drop<?=$drop['id']?>" ondragenter="onDragEnter(event)" ondragover="onDragOver(event)" ondragleave="onDragLeave(event)" ondrop="onDrop(event)" style="position:absolute; width:<?=$drop['width']?>px; height:<?=$drop['height']?>px; margin:<?=$drop['top']?>px 0 0 <?=$drop['left']?>px;"><?php if(!is_null($drop['useranswer'])) : ?><img id="drag<?=$drop['useranswer']['id']?>" draggable="true" ondragstart="onDragStart(event)" ondragend="onDragEnd(event)" src="<?=$linker->link(array('media','index',$seminary['url'],$drop['useranswer']['media']['url']))?>" /><?php endif ?></div>
-		<input type="hidden" id="dnd_drop<?=$drop['id']?>" name="answers[<?=$drop['id']?>]" value="<?=(!is_null($drop['useranswer'])) ? 'drag'.$drop['useranswer']['id'] : null ?>" />
+		<div id="drop<?=$drop['id']?>" ondragenter="onDragEnter(event)" ondragover="onDragOver(event)" ondragleave="onDragLeave(event)" ondrop="onDrop(event)" style="position:absolute; width:<?=$drop['width']?>px; height:<?=$drop['height']?>px; margin:<?=$drop['top']?>px 0 0 <?=$drop['left']?>px;"><?php if(array_key_exists('answer', $drop) && !is_null($drop['answer'])) : ?><img id="drag<?=$drop['answer']['id']?>" draggable="true" ondragstart="onDragStart(event)" ondragend="onDragEnd(event)" src="<?=$linker->link(array('media','index',$seminary['url'],$drop['answer']['media']['url']))?>" /><?php endif ?></div>
+		<input type="hidden" id="dnd_drop<?=$drop['id']?>" name="answers[<?=$drop['id']?>]" value="<?=(!is_null($drop['answer'])) ? 'drag'.$drop['answer']['id'] : null ?>" />
 		<?php endforeach ?>
 	</div>
 	
diff --git a/questtypes/dragndrop/html/submission.tpl b/questtypes/dragndrop/html/submission.tpl
index 90148212..043d39ac 100644
--- a/questtypes/dragndrop/html/submission.tpl
+++ b/questtypes/dragndrop/html/submission.tpl
@@ -1,8 +1,8 @@
 <div style="width:<?=$field['width']?>px; height:<?=$field['height']?>px; background-image:url('<?=$linker->link(array('media','index',$seminary['url'],$field['media']['url']))?>')">
 	<?php foreach($drops as &$drop) : ?>
 	<div id="drop<?=$drop['id']?>" style="position:absolute; width:<?=$drop['width']?>px; height:<?=$drop['height']?>px; margin:<?=$drop['top']?>px 0 0 <?=$drop['left']?>px;">
-		<?php if(!is_null($drop['useranswer'])) : ?>
-		<img id="drag<?=$drop['useranswer']['id']?>" src="<?=$linker->link(array('media','index',$seminary['url'],$drop['useranswer']['media']['url']))?>" />
+		<?php if(!is_null($drop['answer'])) : ?>
+		<img id="drag<?=$drop['answer']['id']?>" src="<?=$linker->link(array('media','index',$seminary['url'],$drop['answer']['media']['url']))?>" />
 		<?php endif ?>
 	</div>
 	<?php endforeach ?>