diff --git a/ui/src/Pages/SharePage/SharePage.js b/ui/src/Pages/SharePage/SharePage.js
index 0fcf4044..b8c49ef4 100644
--- a/ui/src/Pages/SharePage/SharePage.js
+++ b/ui/src/Pages/SharePage/SharePage.js
@@ -176,6 +176,7 @@ const TokenRoute = ({ match }) => {
   const { loading, error, data, refetch } = useQuery(
     VALIDATE_TOKEN_PASSWORD_QUERY,
     {
+      notifyOnNetworkStatusChange: true,
       variables: {
         token: match.params.token,
         password: getSharePassword(match.params.token),
@@ -202,7 +203,7 @@ const TokenRoute = ({ match }) => {
         match={match}
         refetchWithPassword={password => {
           saveSharePassword(token, password)
-          refetch({ variables: { password } })
+          refetch({ token, password })
         }}
         loading={loading}
       />
diff --git a/ui/src/components/sidebar/Sharing.js b/ui/src/components/sidebar/Sharing.js
index b979d368..fda7cc75 100644
--- a/ui/src/components/sidebar/Sharing.js
+++ b/ui/src/components/sidebar/Sharing.js
@@ -115,6 +115,7 @@ const ShareItemMoreDropdown = ({ id, share, isPhoto }) => {
         event.preventDefault()
         setPassword({
           variables: {
+            token: share.token,
             password: event.target.value,
           },
         })
diff --git a/ui/src/components/sidebar/SidebarDownload.js b/ui/src/components/sidebar/SidebarDownload.js
index 3f0dfc8d..d488dfe8 100644
--- a/ui/src/components/sidebar/SidebarDownload.js
+++ b/ui/src/components/sidebar/SidebarDownload.js
@@ -179,7 +179,7 @@ const SidebarDownload = ({ photo }) => {
   let downloadRows = downloads.map(x => (
     <DownloadTableRow
       key={x.mediaUrl.url}
-      onClick={() => downloadMedia(x.mediaUrl.url, photo.title)}
+      onClick={() => downloadMedia(x.mediaUrl.url)}
     >
       <Table.Cell>{`${x.title}`}</Table.Cell>
       <Table.Cell>{`${x.mediaUrl.width} x ${x.mediaUrl.height}`}</Table.Cell>