diff --git a/application/modules/courses/controllers/ViewController.php b/application/modules/courses/controllers/ViewController.php
index ede348091342a25b5996eda7da6ecbad8c45fb76..1821c92622b9cf9d6737c68bdebb783a63789786 100644
--- a/application/modules/courses/controllers/ViewController.php
+++ b/application/modules/courses/controllers/ViewController.php
@@ -17,6 +17,7 @@ class Courses_ViewController extends App_Controller_Action
     			$initialRequest = true;
     		}
     		$preview = true;
+    		$canEdit = false;
     	} else {
             $request = Requests_RequestModel::find($requestId);
             $course = Courses_CourseModel::findLatestOfRequest($request);
@@ -45,6 +46,7 @@ class Courses_ViewController extends App_Controller_Action
 	        		$nextRequestId = $requestOrder[$listPosition + 1];
 	        	}
 	        }
+	        $canEdit = in_array($request->getId(), $myRequestSession->editableRequests);
     	}
 
     	$comments = Requests_CommentsModel::findByRequest($request);
@@ -61,7 +63,9 @@ class Courses_ViewController extends App_Controller_Action
     	$this->view->isRequestValid = $course->isValid() && $request->isValid();
     	$this->view->prevRequestId = $prevRequestId;
     	$this->view->nextRequestId = $nextRequestId;
-    	$this->view->canEdit = in_array($request->getId(), $myRequestSession->editableRequests);
+    	$this->view->canEdit = $canEdit;
+    	$this->view->lastList = $list;
+    	$this->view->lastRoleId = $roleId;
 
         $session = new Zend_Session_Namespace(__CLASS__);
         if ($session->tabName) {
diff --git a/application/modules/courses/views/scripts/view/index.phtml b/application/modules/courses/views/scripts/view/index.phtml
index a70280776a40687451f9a77c827399bcc1a33ae0..a422f5ce0555ff61069e8671d355f59b5a6db725 100644
--- a/application/modules/courses/views/scripts/view/index.phtml
+++ b/application/modules/courses/views/scripts/view/index.phtml
@@ -292,7 +292,7 @@
 
     <?php if($this->canEdit) { ?>
     <div id="editLink">
-        <a href="/Request/Load/<?php echo $this->request->getId(); ?>">-Edit-</a>
+        <a href="<?php echo $this->baseUrl(); ?>/requests/edit/load/id/<?php echo $this->request->getId(); ?>/role/<?php echo $this->lastRoleId; ?>/list/<?php echo $this->lastList; ?>">-Edit-</a>
     </div>
     <?php } ?>