diff --git a/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js b/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
deleted file mode 100644
index 7feb618e4..000000000
--- a/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
+++ /dev/null
@@ -1,260 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { Row, Col } from 'react-bootstrap';
-import { FormattedMessage } from 'react-intl';
-
-import SolutionFiles from '../../Solutions/SolutionFiles';
-import EvaluationDetail from '../../Solutions/EvaluationDetail';
-import TestResults from '../../Solutions/TestResults';
-import DownloadResultArchiveContainer from '../../../containers/DownloadResultArchiveContainer';
-import CommentThreadContainer from '../../../containers/CommentThreadContainer';
-import SourceCodeViewerContainer from '../../../containers/SourceCodeViewerContainer';
-import SubmissionEvaluations from '../../Solutions/SubmissionEvaluations';
-import { ScoreConfigInfoDialog } from '../../scoreConfig/ScoreConfigInfo';
-import CompilationLogs from '../../Solutions/CompilationLogs';
-import SolutionStatus from '../../Solutions/SolutionStatus';
-
-import Button from '../../widgets/TheButton';
-import Callout from '../../widgets/Callout';
-import FailureReport from '../../SubmissionFailures/FailureReport';
-import ResourceRenderer from '../../helpers/ResourceRenderer';
-import { RefreshIcon, WarningIcon } from '../../icons';
-
-import { EMPTY_OBJ, getFirstItemInOrder } from '../../../helpers/common';
-
-const getLastSubmissionId = evaluations => {
-  const evalArray = Object.values(evaluations)
-    .map(x => x.data)
-    .filter(a => a.submittedAt);
-  const first = getFirstItemInOrder(evalArray, (a, b) => b.submittedAt - a.submittedAt);
-  return first && first.id;
-};
-
-class ReferenceSolutionDetail extends Component {
-  state = {
-    openFileId: null,
-    openFileName: '',
-    openZipEntry: null,
-    activeSubmissionId: null,
-    scoreDialogOpened: false,
-  };
-
-  setActiveSubmission = id => {
-    this.props.fetchScoreConfigIfNeeded && this.props.fetchScoreConfigIfNeeded(id);
-    this.setState({ activeSubmissionId: id });
-  };
-
-  openFile = (openFileId, openFileName, openZipEntry = null) =>
-    this.setState({ openFileId, openFileName, openZipEntry });
-
-  hideFile = () => this.setState({ openFileId: null, openFileName: '', openZipEntry: null });
-
-  openScoreDialog = () => {
-    const evaluationsJS = this.props.evaluations && this.props.evaluations.toJS();
-    const activeSubmissionId = evaluationsJS && (this.state.activeSubmissionId || getLastSubmissionId(evaluationsJS));
-    if (activeSubmissionId) {
-      this.props.fetchScoreConfigIfNeeded && this.props.fetchScoreConfigIfNeeded(activeSubmissionId);
-      this.setState({ scoreDialogOpened: true });
-    }
-  };
-
-  closeScoreDialog = () => this.setState({ scoreDialogOpened: false });
-
-  render() {
-    const {
-      solution: { id, description, runtimeEnvironmentId, createdAt, authorId, visibility, permissionHints = EMPTY_OBJ },
-      files,
-      download,
-      exercise,
-      evaluations,
-      deleteEvaluation = null,
-      refreshSolutionEvaluations = null,
-      runtimeEnvironments,
-      scoreConfigSelector = null,
-      canResubmit = false,
-    } = this.props;
-    const { openFileId, openFileName, openZipEntry, scoreDialogOpened } = this.state;
-    const evaluationsJS = evaluations && evaluations.toJS();
-    const activeSubmissionId = evaluationsJS && (this.state.activeSubmissionId || getLastSubmissionId(evaluationsJS));
-
-    if (activeSubmissionId && evaluationsJS[activeSubmissionId] && evaluationsJS[activeSubmissionId].data) {
-      /* eslint-disable no-var */
-      var { submittedBy, evaluation, failure, isDebug, ...restSub } = evaluationsJS[activeSubmissionId].data;
-    }
-
-    return (
-      <div>
-        <Row>
-          <Col md={6} sm={12}>
-            <SolutionStatus
-              referenceSolution
-              description={description}
-              submittedAt={createdAt}
-              userId={authorId}
-              submittedBy={submittedBy}
-              visibility={visibility}
-              runtimeEnvironmentId={runtimeEnvironmentId}
-              runtimeEnvironments={runtimeEnvironments}
-            />
-
-            <SolutionFiles
-              solutionId={id}
-              files={files}
-              authorId={authorId}
-              isReference={true}
-              openFile={this.openFile}
-              download={download}
-            />
-
-            <CommentThreadContainer
-              threadId={id}
-              additionalPublicSwitchNote={
-                <FormattedMessage
-                  id="app.referenceSolutionDetail.comments.additionalSwitchNote"
-                  defaultMessage="(teachers who can see this reference solution)"
-                />
-              }
-            />
-          </Col>
-
-          {evaluations && (
-            <Col md={6} sm={12}>
-              {!evaluation && (!evaluations || evaluations.size === 0) && (
-                <Callout variant="danger" icon={<WarningIcon />}>
-                  <FormattedMessage
-                    id="app.submissionEvaluation.noEvaluationsWhatSoEver"
-                    defaultMessage="There are no submission evaluations. This is higly unusual, since the solution is submitted for evaluation as soon as it is created. Check the configuration of the exercise and try to resubmit this solution again."
-                  />
-                </Callout>
-              )}
-
-              {!evaluation && !failure && evaluations && evaluations.size > 0 && refreshSolutionEvaluations && (
-                <Callout variant="warning">
-                  <table>
-                    <tbody>
-                      <tr>
-                        <td width="100%" className="em-padding-right">
-                          <FormattedMessage
-                            id="app.submissionEvaluation.noEvaluationYet"
-                            defaultMessage="The evaluation is not available yet. Click the refresh button for an update."
-                          />
-                        </td>
-                        <td>
-                          <Button onClick={refreshSolutionEvaluations} variant="primary">
-                            <RefreshIcon gapRight />
-                            <FormattedMessage id="generic.refresh" defaultMessage="Refresh" />
-                          </Button>
-                        </td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </Callout>
-              )}
-
-              {failure && <FailureReport failure={failure} />}
-
-              {evaluation && (
-                <EvaluationDetail
-                  evaluation={evaluation}
-                  isDebug={isDebug}
-                  viewResumbissions
-                  showScoreDetail={this.openScoreDialog}
-                  referenceSolution
-                />
-              )}
-
-              {evaluation && <CompilationLogs initiationOutputs={evaluation.initiationOutputs} />}
-
-              {evaluation && (
-                <TestResults
-                  evaluation={evaluation}
-                  runtimeEnvironmentId={runtimeEnvironmentId}
-                  showJudgeLogStdout
-                  showJudgeLogStderr
-                  isJudgeLogMerged={exercise.mergeJudgeLogs}
-                />
-              )}
-
-              {evaluation && (
-                <Row>
-                  <Col lg={6} md={12}>
-                    <DownloadResultArchiveContainer submissionId={restSub.id} isReference={true} />
-                  </Col>
-                </Row>
-              )}
-              {activeSubmissionId && (
-                <Row>
-                  <Col lg={12}>
-                    <ResourceRenderer resource={evaluations.toArray()} returnAsArray>
-                      {evaluations => (
-                        <SubmissionEvaluations
-                          submissionId={id}
-                          evaluations={evaluations}
-                          activeSubmissionId={activeSubmissionId}
-                          showInfo={false}
-                          onSelect={this.setActiveSubmission}
-                          onDelete={permissionHints.deleteEvaluation ? deleteEvaluation : null}
-                        />
-                      )}
-                    </ResourceRenderer>
-                  </Col>
-                </Row>
-              )}
-            </Col>
-          )}
-        </Row>
-
-        <SourceCodeViewerContainer
-          solutionId={id}
-          files={files}
-          openAnotherFile={this.openFile}
-          show={openFileId !== null}
-          fileId={openFileId || ''}
-          fileName={openFileName}
-          zipEntry={openZipEntry}
-          isReference={true}
-          onHide={this.hideFile}
-          submittedBy={authorId}
-        />
-
-        {activeSubmissionId && scoreConfigSelector && (
-          <ScoreConfigInfoDialog
-            show={scoreDialogOpened}
-            onHide={this.closeScoreDialog}
-            scoreConfig={scoreConfigSelector(activeSubmissionId)}
-            testResults={evaluation && evaluation.testResults}
-            canResubmit={canResubmit}
-          />
-        )}
-      </div>
-    );
-  }
-}
-
-ReferenceSolutionDetail.propTypes = {
-  solution: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    description: PropTypes.string,
-    runtimeEnvironmentId: PropTypes.string,
-    note: PropTypes.string,
-    lastSubmission: PropTypes.shape({ id: PropTypes.string.isRequired }),
-    createdAt: PropTypes.number.isRequired,
-    authorId: PropTypes.string.isRequired,
-    submissions: PropTypes.array.isRequired,
-    visibility: PropTypes.number.isRequired,
-    permissionHints: PropTypes.object,
-  }).isRequired,
-  files: ImmutablePropTypes.map,
-  download: PropTypes.func,
-  exercise: PropTypes.object.isRequired,
-  evaluations: PropTypes.object.isRequired,
-  deleteEvaluation: PropTypes.func,
-  refreshSolutionEvaluations: PropTypes.func,
-  runtimeEnvironments: PropTypes.array,
-  scoreConfigSelector: PropTypes.func,
-  fetchScoreConfigIfNeeded: PropTypes.func,
-  canResubmit: PropTypes.bool,
-};
-
-export default ReferenceSolutionDetail;
diff --git a/src/components/ReferenceSolutions/ReferenceSolutionDetail/index.js b/src/components/ReferenceSolutions/ReferenceSolutionDetail/index.js
deleted file mode 100644
index e2226dc7f..000000000
--- a/src/components/ReferenceSolutions/ReferenceSolutionDetail/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import ReferenceSolutionDetail from './ReferenceSolutionDetail';
-export default ReferenceSolutionDetail;
diff --git a/src/components/Solutions/SolutionDetail/SolutionDetail.js b/src/components/Solutions/SolutionDetail/SolutionDetail.js
index 2120993cb..dd0c85a8a 100644
--- a/src/components/Solutions/SolutionDetail/SolutionDetail.js
+++ b/src/components/Solutions/SolutionDetail/SolutionDetail.js
@@ -17,7 +17,7 @@ import ResourceRenderer from '../../helpers/ResourceRenderer';
 import SolutionFiles from '../SolutionFiles';
 import EvaluationDetail from '../EvaluationDetail';
 import CompilationLogs from '../CompilationLogs';
-import { RefreshIcon } from '../../icons';
+import { RefreshIcon, WarningIcon } from '../../icons';
 import FailureReport from '../../SubmissionFailures/FailureReport';
 import Button from '../../widgets/TheButton';
 import Callout from '../../widgets/Callout';
@@ -59,24 +59,27 @@ class SolutionDetail extends Component {
     const {
       solution: {
         id,
-        attemptIndex,
-        note = '',
-        createdAt,
-        authorId,
-        maxPoints,
-        overriddenPoints,
-        bonusPoints,
-        actualPoints,
-        accepted,
-        review = null,
         runtimeEnvironmentId,
         lastSubmission,
         permissionHints = EMPTY_OBJ,
+        createdAt,
+        authorId,
+        description = null,
+        note = null,
+        attemptIndex = null,
+        maxPoints = null,
+        overriddenPoints = null,
+        bonusPoints = null,
+        actualPoints = null,
+        accepted = null,
+        review = null,
+        visibility = null,
       },
       files,
       download,
       otherSolutions,
-      assignment,
+      exercise = null,
+      assignment = null,
       evaluations,
       runtimeEnvironments,
       editNote = null,
@@ -97,6 +100,8 @@ class SolutionDetail extends Component {
       var { submittedBy, evaluation, failure, isDebug, ...restSub } = evaluationsJS[activeSubmissionId].data;
     }
 
+    const referenceSolution = exercise !== null;
+
     return (
       <div>
         <Row>
@@ -110,6 +115,7 @@ class SolutionDetail extends Component {
               userId={authorId}
               submittedBy={submittedBy}
               note={note}
+              description={description}
               editNote={editNote}
               accepted={accepted}
               review={review}
@@ -123,9 +129,20 @@ class SolutionDetail extends Component {
               otherSolutions={otherSolutions}
               assignmentSolversLoading={assignmentSolversLoading}
               assignmentSolverSelector={assignmentSolverSelector}
+              visibility={visibility}
+              referenceSolution={referenceSolution}
             />
           </Col>
           <Col xl={6}>
+            {referenceSolution && !evaluation && (!evaluations || evaluations.size === 0) && (
+              <Callout variant="danger" icon={<WarningIcon />}>
+                <FormattedMessage
+                  id="app.submissionEvaluation.noEvaluationsWhatSoEver"
+                  defaultMessage="There are no submission evaluations. This is higly unusual, since the solution is submitted for evaluation as soon as it is created. Check the configuration of the exercise and try to resubmit this solution again."
+                />
+              </Callout>
+            )}
+
             {!evaluation && !failure && refreshSolutionEvaluations && (
               <Callout variant="warning">
                 <table>
@@ -151,7 +168,7 @@ class SolutionDetail extends Component {
 
             {failure && <FailureReport failure={failure} />}
 
-            {activeSubmissionId !== safeGet(lastSubmission, ['id']) && (
+            {!referenceSolution && activeSubmissionId !== safeGet(lastSubmission, ['id']) && (
               <Callout variant="warning">
                 <FormattedMessage
                   id="app.evaluationDetail.notActualEvaluation"
@@ -167,6 +184,7 @@ class SolutionDetail extends Component {
                 isDebug={isDebug}
                 viewResumbissions={permissionHints.viewResubmissions}
                 showScoreDetail={this.openScoreDialog}
+                referenceSolution={referenceSolution}
               />
             )}
           </Col>
@@ -176,14 +194,15 @@ class SolutionDetail extends Component {
           <Col xl={6}>
             <SolutionFiles
               solutionId={id}
-              attemptIndex={attemptIndex}
               files={files}
               authorId={authorId}
+              isReference={referenceSolution}
+              attemptIndex={attemptIndex}
               openFile={this.openFile}
               download={download}
             />
 
-            {permissionHints.setBonusPoints && (
+            {!referenceSolution && assignment && permissionHints.setBonusPoints && (
               <PointsContainer
                 submissionId={id}
                 overriddenPoints={overriddenPoints}
@@ -202,10 +221,17 @@ class SolutionDetail extends Component {
               <CommentThreadContainer
                 threadId={id}
                 additionalPublicSwitchNote={
-                  <FormattedMessage
-                    id="app.solutionDetail.comments.additionalSwitchNote"
-                    defaultMessage="(author of the solution and supervisors of this group)"
-                  />
+                  referenceSolution ? (
+                    <FormattedMessage
+                      id="app.referenceSolutionDetail.comments.additionalSwitchNote"
+                      defaultMessage="(teachers who can see this reference solution)"
+                    />
+                  ) : (
+                    <FormattedMessage
+                      id="app.solutionDetail.comments.additionalSwitchNote"
+                      defaultMessage="(author of the solution and supervisors of this group)"
+                    />
+                  )
                 }
               />
             )}
@@ -219,55 +245,60 @@ class SolutionDetail extends Component {
                 <TestResults
                   evaluation={evaluation}
                   runtimeEnvironmentId={runtimeEnvironmentId}
-                  showJudgeLogStdout={permissionHints.viewEvaluationJudgeStdout}
-                  showJudgeLogStderr={permissionHints.viewEvaluationJudgeStderr}
-                  isJudgeLogStdoutPublic={assignment.canViewJudgeStdout}
-                  isJudgeLogStderrPublic={assignment.canViewJudgeStderr}
-                  isJudgeLogMerged={assignment.mergeJudgeLogs}
+                  showJudgeLogStdout={referenceSolution || permissionHints.viewEvaluationJudgeStdout}
+                  showJudgeLogStderr={referenceSolution || permissionHints.viewEvaluationJudgeStderr}
+                  isJudgeLogStdoutPublic={referenceSolution ? null : assignment.canViewJudgeStdout}
+                  isJudgeLogStderrPublic={referenceSolution ? null : assignment.canViewJudgeStderr}
+                  isJudgeLogMerged={(assignment || exercise).mergeJudgeLogs}
                 />
               )}
 
               {evaluation && permissionHints.downloadResultArchive && (
                 <Row>
                   <Col lg={6} md={12}>
-                    <DownloadResultArchiveContainer submissionId={restSub.id} />
+                    <DownloadResultArchiveContainer submissionId={restSub.id} isReference={referenceSolution} />
                   </Col>
                 </Row>
               )}
 
-              {activeSubmissionId && permissionHints.viewResubmissions && evaluations && evaluations.size > 1 && (
-                <Row>
-                  <Col lg={12}>
-                    <ResourceRenderer resource={evaluations.toArray()} returnAsArray>
-                      {evaluations => (
-                        <SubmissionEvaluations
-                          submissionId={id}
-                          evaluations={evaluations}
-                          activeSubmissionId={activeSubmissionId}
-                          onSelect={this.setActiveSubmission}
-                          onDelete={permissionHints.deleteEvaluation ? deleteEvaluation : null}
-                          confirmDeleteLastSubmit
-                        />
-                      )}
-                    </ResourceRenderer>
-                  </Col>
-                </Row>
-              )}
+              {activeSubmissionId &&
+                (referenceSolution || permissionHints.viewResubmissions) &&
+                evaluations &&
+                evaluations.size > 1 && (
+                  <Row>
+                    <Col lg={12}>
+                      <ResourceRenderer resource={evaluations.toArray()} returnAsArray>
+                        {evaluations => (
+                          <SubmissionEvaluations
+                            submissionId={id}
+                            evaluations={evaluations}
+                            activeSubmissionId={activeSubmissionId}
+                            showInfo={!referenceSolution}
+                            onSelect={this.setActiveSubmission}
+                            onDelete={permissionHints.deleteEvaluation ? deleteEvaluation : null}
+                            confirmDeleteLastSubmit
+                          />
+                        )}
+                      </ResourceRenderer>
+                    </Col>
+                  </Row>
+                )}
             </Col>
           )}
         </Row>
 
         <SourceCodeViewerContainer
           solutionId={id}
+          files={files}
           show={openFileId !== null}
           fileId={openFileId || ''}
           fileName={openFileName}
           zipEntry={openZipEntry}
-          files={files}
           openAnotherFile={this.openFile}
           onHide={this.hideFile}
           submittedBy={authorId}
         />
+
         {activeSubmissionId && scoreConfigSelector && (
           <ScoreConfigInfoDialog
             show={scoreDialogOpened}
@@ -284,38 +315,44 @@ class SolutionDetail extends Component {
 
 SolutionDetail.propTypes = {
   solution: PropTypes.shape({
+    // common part for both solution types
     id: PropTypes.string.isRequired,
-    attemptIndex: PropTypes.number.isRequired,
-    note: PropTypes.string,
+    runtimeEnvironmentId: PropTypes.string,
     lastSubmission: PropTypes.shape({ id: PropTypes.string.isRequired }),
     createdAt: PropTypes.number.isRequired,
     authorId: PropTypes.string.isRequired,
-    maxPoints: PropTypes.number.isRequired,
-    bonusPoints: PropTypes.number.isRequired,
+    permissionHints: PropTypes.object,
+    // specific to assignment solutions only
+    note: PropTypes.string,
+    attemptIndex: PropTypes.number,
+    maxPoints: PropTypes.number,
+    bonusPoints: PropTypes.number,
     overriddenPoints: PropTypes.number,
     actualPoints: PropTypes.number,
-    accepted: PropTypes.bool.isRequired,
+    accepted: PropTypes.bool,
     review: PropTypes.shape({
       startedAt: PropTypes.number,
       closedAt: PropTypes.number,
       issues: PropTypes.number,
     }),
-    runtimeEnvironmentId: PropTypes.string,
-    permissionHints: PropTypes.object,
+    // specific to reference solutions only
+    description: PropTypes.string,
+    visibility: PropTypes.number,
   }).isRequired,
   files: ImmutablePropTypes.map,
-  download: PropTypes.func,
-  otherSolutions: ImmutablePropTypes.list.isRequired,
-  assignmentSolversLoading: PropTypes.bool,
-  assignmentSolverSelector: PropTypes.func.isRequired,
-  assignment: PropTypes.object.isRequired,
   evaluations: PropTypes.object.isRequired,
-  currentUser: PropTypes.object.isRequired,
   runtimeEnvironments: PropTypes.array,
+  currentUser: PropTypes.object.isRequired,
+  exercise: PropTypes.object,
+  otherSolutions: ImmutablePropTypes.list,
+  assignmentSolversLoading: PropTypes.bool,
+  assignmentSolverSelector: PropTypes.func,
+  assignment: PropTypes.object,
   editNote: PropTypes.func,
+  scoreConfigSelector: PropTypes.func,
+  download: PropTypes.func,
   deleteEvaluation: PropTypes.func,
   refreshSolutionEvaluations: PropTypes.func,
-  scoreConfigSelector: PropTypes.func,
   fetchScoreConfigIfNeeded: PropTypes.func,
   canResubmit: PropTypes.bool,
 };
diff --git a/src/components/Solutions/SolutionStatus/SolutionStatus.js b/src/components/Solutions/SolutionStatus/SolutionStatus.js
index 3e19caff2..9e22d1244 100644
--- a/src/components/Solutions/SolutionStatus/SolutionStatus.js
+++ b/src/components/Solutions/SolutionStatus/SolutionStatus.js
@@ -553,7 +553,7 @@ class SolutionStatus extends Component {
           </Modal>
         )}
 
-        {evaluation && (
+        {!referenceSolution && evaluation && (
           <Modal show={this.state.explainDialogOpen} backdrop="static" onHide={this.closeDialog} size="xl">
             <Modal.Header closeButton>
               <Modal.Title>
diff --git a/src/pages/ReferenceSolution/ReferenceSolution.js b/src/pages/ReferenceSolution/ReferenceSolution.js
index 2f75151bb..3f09c37c6 100644
--- a/src/pages/ReferenceSolution/ReferenceSolution.js
+++ b/src/pages/ReferenceSolution/ReferenceSolution.js
@@ -9,7 +9,7 @@ import ResubmitReferenceSolutionContainer from '../../containers/ResubmitReferen
 import ReferenceSolutionActionsContainer from '../../containers/ReferenceSolutionActionsContainer';
 import Page from '../../components/layout/Page';
 import { ReferenceSolutionNavigation } from '../../components/layout/Navigation';
-import ReferenceSolutionDetail from '../../components/ReferenceSolutions/ReferenceSolutionDetail';
+import SolutionDetail from '../../components/Solutions/SolutionDetail';
 import FetchManyResourceRenderer from '../../components/helpers/FetchManyResourceRenderer';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 import { TheButtonGroup } from '../../components/widgets/TheButton';
@@ -26,6 +26,7 @@ import {
   deleteReferenceSolutionEvaluation,
 } from '../../redux/modules/referenceSolutionEvaluations';
 
+import { loggedInUserSelector } from '../../redux/selectors/users';
 import { getReferenceSolution } from '../../redux/selectors/referenceSolutions';
 import { getSolutionFiles } from '../../redux/selectors/solutionFiles';
 import { getExercise } from '../../redux/selectors/exercises';
@@ -63,6 +64,7 @@ class ReferenceSolution extends Component {
   render() {
     const {
       referenceSolution,
+      currentUser,
       files,
       download,
       exercise,
@@ -79,8 +81,8 @@ class ReferenceSolution extends Component {
       <Page
         icon={<ReferenceSolutionIcon />}
         title={<FormattedMessage id="app.referenceSolution.title" defaultMessage="Reference Solution Detail" />}
-        resource={referenceSolution}>
-        {referenceSolution => (
+        resource={[referenceSolution, currentUser]}>
+        {(referenceSolution, currentUser) => (
           <ResourceRenderer resource={exercise}>
             {exercise => (
               <>
@@ -135,16 +137,17 @@ class ReferenceSolution extends Component {
 
                 <FetchManyResourceRenderer fetchManyStatus={fetchStatus}>
                   {() => (
-                    <ReferenceSolutionDetail
+                    <SolutionDetail
                       solution={referenceSolution}
                       files={files}
-                      download={download}
                       evaluations={evaluations}
+                      runtimeEnvironments={exercise.runtimeEnvironments}
+                      currentUser={currentUser}
                       exercise={exercise}
+                      scoreConfigSelector={scoreConfigSelector}
+                      download={download}
                       deleteEvaluation={deleteEvaluation}
                       refreshSolutionEvaluations={refreshSolutionEvaluations}
-                      runtimeEnvironments={exercise.runtimeEnvironments}
-                      scoreConfigSelector={scoreConfigSelector}
                       fetchScoreConfigIfNeeded={fetchScoreConfigIfNeeded}
                       canResubmit={hasPermissions(referenceSolution, 'evaluate')}
                     />
@@ -166,6 +169,7 @@ ReferenceSolution.propTypes = {
   }).isRequired,
   loadAsync: PropTypes.func.isRequired,
   fetchScoreConfigIfNeeded: PropTypes.func.isRequired,
+  currentUser: ImmutablePropTypes.map,
   referenceSolution: ImmutablePropTypes.map,
   files: ImmutablePropTypes.map,
   exercise: ImmutablePropTypes.map,
@@ -181,6 +185,7 @@ ReferenceSolution.propTypes = {
 export default injectIntl(
   connect(
     (state, { params: { exerciseId, referenceSolutionId } }) => ({
+      currentUser: loggedInUserSelector(state),
       referenceSolution: getReferenceSolution(referenceSolutionId)(state),
       files: getSolutionFiles(state, referenceSolutionId),
       exercise: getExercise(exerciseId)(state),
diff --git a/src/pages/Solution/Solution.js b/src/pages/Solution/Solution.js
index b37b467b3..bd81b03fe 100644
--- a/src/pages/Solution/Solution.js
+++ b/src/pages/Solution/Solution.js
@@ -269,20 +269,20 @@ class Solution extends Component {
                       <SolutionDetail
                         solution={solution}
                         files={files}
-                        download={download}
+                        evaluations={evaluations}
+                        runtimeEnvironments={runtimes}
+                        currentUser={currentUser}
                         otherSolutions={userSolutionsSelector(solution.authorId, assignment.id)}
                         assignmentSolversLoading={assignmentSolversLoading}
                         assignmentSolverSelector={assignmentSolverSelector}
                         assignment={assignment}
-                        evaluations={evaluations}
-                        runtimeEnvironments={runtimes}
-                        deleteEvaluation={deleteEvaluation}
-                        refreshSolutionEvaluations={refreshSolutionEvaluations}
                         editNote={hasPermissions(solution, 'update') ? editNote : null}
                         scoreConfigSelector={scoreConfigSelector}
+                        download={download}
+                        deleteEvaluation={deleteEvaluation}
+                        refreshSolutionEvaluations={refreshSolutionEvaluations}
                         fetchScoreConfigIfNeeded={fetchScoreConfigIfNeeded}
                         canResubmit={hasPermissions(assignment, 'resubmitSubmissions')}
-                        currentUser={currentUser}
                       />
                     )}
                   </FetchManyResourceRenderer>