diff --git a/lib/galaxy/web/controllers/requests_admin.py b/lib/galaxy/web/controllers/requests_admin.py
index 550b313f6ec..157c3ced559 100644
--- a/lib/galaxy/web/controllers/requests_admin.py
+++ b/lib/galaxy/web/controllers/requests_admin.py
@@ -1773,23 +1773,23 @@ class RequestsAdmin( BaseController ):
                                     message=message,
                                     status=status)
         
-#    def __sample_datasets(self, trans, **kwd):
-#        samples = trans.sa_session.query( trans.app.model.Sample ).all()
-#        for s in samples:
-#            if s.dataset_files:
-#                newdf = []
-#                for df in s.dataset_files:
-#                    if type(s.dataset_files[0]) == type([1,2]):
-#                        filepath = df[0]
-#                        status = df[1]
-#                        newdf.append(dict(filepath=filepath,
-#                                          status=status,
-#                                          name=filepath.split('/')[-1],
-#                                          error_msg='',
-#                                          size='Unknown'))
-#                        s.dataset_files = newdf
-#                        trans.sa_session.add( s )
-#                        trans.sa_session.flush()
+    def __sample_datasets(self, trans, **kwd):
+        samples = trans.sa_session.query( trans.app.model.Sample ).all()
+        for s in samples:
+            if s.dataset_files:
+                newdf = []
+                for df in s.dataset_files:
+                    if type(s.dataset_files[0]) == type([1,2]):
+                        filepath = df[0]
+                        status = df[1]
+                        newdf.append(dict(filepath=filepath,
+                                          status=status,
+                                          name=filepath.split('/')[-1],
+                                          error_msg='',
+                                          size='Unknown'))
+                        s.dataset_files = newdf
+                        trans.sa_session.add( s )
+                        trans.sa_session.flush()
 #                
 ##
 #### Request Type Stuff ###################################################
diff --git a/templates/admin/requests/show_request.mako b/templates/admin/requests/show_request.mako
index cb10dd1ac30..c7eba9850dc 100644
--- a/templates/admin/requests/show_request.mako
+++ b/templates/admin/requests/show_request.mako
@@ -292,6 +292,11 @@ $(document).ready(function(){
                 </select>
             %elif field['type'] == 'WorkflowField':
                 <select name="sample_${index}_field_${field_index}">
+                    %if str(sample_values[field_index]) == 'none':
+                        <option value="none" selected>Select one</option>
+                    %else:
+                        <option value="none">Select one</option>
+                    %endif
                     %for option_index, option in enumerate(request.user.stored_workflows):
                         %if not option.deleted:
                             %if str(option.id) == str(sample_values[field_index]):
@@ -320,8 +325,10 @@ $(document).ready(function(){
         <td>
             %if sample_values[field_index]:
                 %if field['type'] == 'WorkflowField':
-                    <% workflow = trans.sa_session.query( trans.app.model.StoredWorkflow ).get( int(sample_values[field_index]) ) %>
-                    <a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
+                    %if str(sample_values[field_index]) != 'none':
+                        <% workflow = trans.sa_session.query( trans.app.model.StoredWorkflow ).get( int(sample_values[field_index]) ) %>
+                        <a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
+                    %endif
                 %else:
                     ${sample_values[field_index]}
                 %endif
diff --git a/templates/requests/show_request.mako b/templates/requests/show_request.mako
index 3a3dc9d01c2..1ade2ea296c 100644
--- a/templates/requests/show_request.mako
+++ b/templates/requests/show_request.mako
@@ -214,6 +214,11 @@ $(document).ready(function(){
                 </select>
             %elif field['type'] == 'WorkflowField':
                 <select name="sample_${index}_field_${field_index}">
+                    %if str(sample_values[field_index]) == 'none':
+                        <option value="none" selected>Select one</option>
+                    %else:
+                        <option value="none">Select one</option>
+                    %endif
                     %for option_index, option in enumerate(request.user.stored_workflows):
                         %if not option.deleted:
                             %if str(option.id) == str(sample_values[field_index]):
@@ -242,8 +247,10 @@ $(document).ready(function(){
         <td>
             %if sample_values[field_index]:
                 %if field['type'] == 'WorkflowField':
-                    <% workflow = trans.sa_session.query( trans.app.model.StoredWorkflow ).get( int(sample_values[field_index]) ) %>
-                    <a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
+                    %if str(sample_values[field_index]) != 'none':
+                        <% workflow = trans.sa_session.query( trans.app.model.StoredWorkflow ).get( int(sample_values[field_index]) ) %>
+                        <a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
+                    %endif
                 %else:
                     ${sample_values[field_index]}
                 %endif